From 28e92b89f49bef7989131a356dc24c524bcff51a Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 19 Nov 2001 23:19:21 +0000
Subject: [PATCH] Change 'return ;' to 'return;'; remove space.
---
src/interfaces/jdbc/example/Unicode.java | 2 +-
.../jdbc/example/corba/StockClient.java | 8 ++++----
.../jdbc/example/corba/StockDispenserImpl.java | 6 +++---
.../jdbc/example/corba/StockServer.java | 6 +++---
src/interfaces/jdbc/example/psql.java | 2 +-
.../jdbc/org/postgresql/Connection.java | 8 ++++----
.../jdbc/org/postgresql/core/BytePoolDim1.java | 2 +-
.../jdbc/org/postgresql/core/BytePoolDim2.java | 2 +-
.../org/postgresql/core/SimpleObjectPool.java | 2 +-
.../org/postgresql/jdbc1/PreparedStatement.java | 4 ++--
.../org/postgresql/jdbc2/PreparedStatement.java | 4 ++--
.../jdbc/org/postgresql/util/Serialize.java | 2 +-
.../jdbc/org/postgresql/xa/ClientConnection.java | 4 ++--
.../jdbc/org/postgresql/xa/XAConnectionImpl.java | 16 ++++++++--------
14 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/interfaces/jdbc/example/Unicode.java b/src/interfaces/jdbc/example/Unicode.java
index 2312742235b..aa8b3bf424b 100644
--- a/src/interfaces/jdbc/example/Unicode.java
+++ b/src/interfaces/jdbc/example/Unicode.java
@@ -234,7 +234,7 @@ public class Unicode
catch (ClassNotFoundException cnfe)
{
log("Unable to load driver", cnfe);
- return ;
+ return;
}
try
{
diff --git a/src/interfaces/jdbc/example/corba/StockClient.java b/src/interfaces/jdbc/example/corba/StockClient.java
index 519bf49f97d..258d2df2f4e 100644
--- a/src/interfaces/jdbc/example/corba/StockClient.java
+++ b/src/interfaces/jdbc/example/corba/StockClient.java
@@ -9,7 +9,7 @@ import org.omg.CosNaming.*;
*
* It has no GUI, just a text frontend to keep it simple.
*
- * $Id: StockClient.java,v 1.4 2001/11/19 23:16:45 momjian Exp $
+ * $Id: StockClient.java,v 1.5 2001/11/19 23:19:20 momjian Exp $
*/
public class StockClient
{
@@ -35,14 +35,14 @@ public class StockClient
if (nameServiceObj == null)
{
System.err.println("nameServiceObj == null");
- return ;
+ return;
}
nameService = org.omg.CosNaming.NamingContextHelper.narrow(nameServiceObj);
if (nameService == null)
{
System.err.println("nameService == null");
- return ;
+ return;
}
// Resolve the dispenser
@@ -53,7 +53,7 @@ public class StockClient
if (dispenser == null)
{
System.err.println("dispenser == null");
- return ;
+ return;
}
// Now run the front end.
diff --git a/src/interfaces/jdbc/example/corba/StockDispenserImpl.java b/src/interfaces/jdbc/example/corba/StockDispenserImpl.java
index 54e46181339..15adfe559bc 100644
--- a/src/interfaces/jdbc/example/corba/StockDispenserImpl.java
+++ b/src/interfaces/jdbc/example/corba/StockDispenserImpl.java
@@ -5,7 +5,7 @@ import org.omg.CosNaming.*;
/*
* This class implements the server side of the example.
*
- * $Id: StockDispenserImpl.java,v 1.3 2001/11/19 22:43:13 momjian Exp $
+ * $Id: StockDispenserImpl.java,v 1.4 2001/11/19 23:19:20 momjian Exp $
*/
public class StockDispenserImpl extends stock._StockDispenserImplBase
{
@@ -67,11 +67,11 @@ public class StockDispenserImpl extends stock._StockDispenserImplBase
{
stock[i].inUse = false;
System.out.println("Releasing slot " + i);
- return ;
+ return;
}
}
System.out.println("Reserved object not a member of this dispenser");
- return ;
+ return;
}
/*
diff --git a/src/interfaces/jdbc/example/corba/StockServer.java b/src/interfaces/jdbc/example/corba/StockServer.java
index 77d8946389b..43dcbc64fac 100644
--- a/src/interfaces/jdbc/example/corba/StockServer.java
+++ b/src/interfaces/jdbc/example/corba/StockServer.java
@@ -5,7 +5,7 @@ import org.omg.CosNaming.*;
/*
* This class implements the server side of the example.
*
- * $Id: StockServer.java,v 1.3 2001/11/19 22:43:13 momjian Exp $
+ * $Id: StockServer.java,v 1.4 2001/11/19 23:19:20 momjian Exp $
*/
public class StockServer
{
@@ -29,14 +29,14 @@ public class StockServer
if (nameServiceObj == null)
{
System.err.println("nameServiceObj = null");
- return ;
+ return;
}
org.omg.CosNaming.NamingContext nameService = org.omg.CosNaming.NamingContextHelper.narrow(nameServiceObj);
if (nameService == null)
{
System.err.println("nameService = null");
- return ;
+ return;
}
// bind the dispenser into the naming service
diff --git a/src/interfaces/jdbc/example/psql.java b/src/interfaces/jdbc/example/psql.java
index a5af214d574..05932937279 100644
--- a/src/interfaces/jdbc/example/psql.java
+++ b/src/interfaces/jdbc/example/psql.java
@@ -82,7 +82,7 @@ public class psql
if (line.startsWith("\\"))
{
processSlashCommand(line);
- return ;
+ return;
}
boolean type = st.execute(line);
diff --git a/src/interfaces/jdbc/org/postgresql/Connection.java b/src/interfaces/jdbc/org/postgresql/Connection.java
index 93bfa677811..e767ac0ed9a 100644
--- a/src/interfaces/jdbc/org/postgresql/Connection.java
+++ b/src/interfaces/jdbc/org/postgresql/Connection.java
@@ -11,7 +11,7 @@ import org.postgresql.util.*;
import org.postgresql.core.*;
/*
- * $Id: Connection.java,v 1.37 2001/11/19 23:16:45 momjian Exp $
+ * $Id: Connection.java,v 1.38 2001/11/19 23:19:20 momjian Exp $
*
* This abstract class is used by org.postgresql.Driver to open either the JDBC1 or
* JDBC2 versions of the Connection class.
@@ -817,7 +817,7 @@ public abstract class Connection
public void setAutoCommit(boolean autoCommit) throws SQLException
{
if (this.autoCommit == autoCommit)
- return ;
+ return;
if (autoCommit)
ExecSQL("end");
else
@@ -860,7 +860,7 @@ public abstract class Connection
public void commit() throws SQLException
{
if (autoCommit)
- return ;
+ return;
if (haveMinimumServerVersion("7.1"))
{
ExecSQL("commit;begin;" + getIsolationLevelSQL());
@@ -884,7 +884,7 @@ public abstract class Connection
public void rollback() throws SQLException
{
if (autoCommit)
- return ;
+ return;
if (haveMinimumServerVersion("7.1"))
{
ExecSQL("rollback; begin;" + getIsolationLevelSQL());
diff --git a/src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java b/src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
index 1badf4f0724..e879a5ed763 100644
--- a/src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
+++ b/src/interfaces/jdbc/org/postgresql/core/BytePoolDim1.java
@@ -76,7 +76,7 @@ public class BytePoolDim1
{
// If it's larger than maxsize then we don't touch it
if (b.length > maxsize)
- return ;
+ return;
ObjectPool not_usel = notusemap[b.length];
ObjectPool in_usel = inusemap[b.length];
diff --git a/src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java b/src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
index df55b30d04f..963320070de 100644
--- a/src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
+++ b/src/interfaces/jdbc/org/postgresql/core/BytePoolDim2.java
@@ -42,7 +42,7 @@ public class BytePoolDim2
{
if (b.length > maxsize)
{
- return ;
+ return;
}
ObjectPool not_usel = notusemap[b.length];
ObjectPool in_usel = inusemap[b.length];
diff --git a/src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java b/src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
index 9603e96ded3..d64126456d9 100644
--- a/src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
+++ b/src/interfaces/jdbc/org/postgresql/core/SimpleObjectPool.java
@@ -83,7 +83,7 @@ public class SimpleObjectPool implements ObjectPool
int srcsize = pool.size();
if (srcsize == 0)
- return ;
+ return;
int totalsize = srcsize + cursize;
if (totalsize > maxsize)
{
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/PreparedStatement.java b/src/interfaces/jdbc/org/postgresql/jdbc1/PreparedStatement.java
index cca7af9bb6a..7116d0b6692 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/PreparedStatement.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/PreparedStatement.java
@@ -613,7 +613,7 @@ public class PreparedStatement extends Statement implements java.sql.PreparedSta
if (x == null)
{
setNull(parameterIndex, Types.OTHER);
- return ;
+ return;
}
switch (targetSqlType)
{
@@ -683,7 +683,7 @@ public class PreparedStatement extends Statement implements java.sql.PreparedSta
if (x == null)
{
setNull(parameterIndex, Types.OTHER);
- return ;
+ return;
}
if (x instanceof String)
setString(parameterIndex, (String)x);
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/PreparedStatement.java b/src/interfaces/jdbc/org/postgresql/jdbc2/PreparedStatement.java
index 1575b166618..3c3146e83ec 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/PreparedStatement.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/PreparedStatement.java
@@ -648,7 +648,7 @@ public class PreparedStatement extends Statement implements java.sql.PreparedSta
if (x == null)
{
setNull(parameterIndex, Types.OTHER);
- return ;
+ return;
}
switch (targetSqlType)
{
@@ -718,7 +718,7 @@ public class PreparedStatement extends Statement implements java.sql.PreparedSta
if (x == null)
{
setNull(parameterIndex, Types.OTHER);
- return ;
+ return;
}
if (x instanceof String)
setString(parameterIndex, (String)x);
diff --git a/src/interfaces/jdbc/org/postgresql/util/Serialize.java b/src/interfaces/jdbc/org/postgresql/util/Serialize.java
index ff198964c00..f49b7570ea1 100644
--- a/src/interfaces/jdbc/org/postgresql/util/Serialize.java
+++ b/src/interfaces/jdbc/org/postgresql/util/Serialize.java
@@ -485,7 +485,7 @@ public class Serialize
{
DriverManager.println("Serialize.create: table " + tableName + " exists, skipping");
rs.close();
- return ;
+ return;
}
// else table not found, so create it
diff --git a/src/interfaces/jdbc/org/postgresql/xa/ClientConnection.java b/src/interfaces/jdbc/org/postgresql/xa/ClientConnection.java
index 8d02af703df..dc46c873e8c 100644
--- a/src/interfaces/jdbc/org/postgresql/xa/ClientConnection.java
+++ b/src/interfaces/jdbc/org/postgresql/xa/ClientConnection.java
@@ -40,7 +40,7 @@
*
* Copyright 1999 (C) Exoffice Technologies Inc. All Rights Reserved.
*
-* $Id: ClientConnection.java,v 1.3 2001/11/19 22:33:39 momjian Exp $
+* $Id: ClientConnection.java,v 1.4 2001/11/19 23:19:21 momjian Exp $
*/
@@ -464,7 +464,7 @@ final class ClientConnection
throws SQLException
{
if ( _xaConn == null )
- return ;
+ return;
// Notify the XA connection that we are no longer going
// to be used. Whether the underlying connection is released,
diff --git a/src/interfaces/jdbc/org/postgresql/xa/XAConnectionImpl.java b/src/interfaces/jdbc/org/postgresql/xa/XAConnectionImpl.java
index 2c7b9fbc9dc..776badfd6d4 100644
--- a/src/interfaces/jdbc/org/postgresql/xa/XAConnectionImpl.java
+++ b/src/interfaces/jdbc/org/postgresql/xa/XAConnectionImpl.java
@@ -40,7 +40,7 @@
*
* Copyright 1999 (C) Exoffice Technologies Inc. All Rights Reserved.
*
-* $Id: XAConnectionImpl.java,v 1.3 2001/11/19 22:33:39 momjian Exp $
+* $Id: XAConnectionImpl.java,v 1.4 2001/11/19 23:19:21 momjian Exp $
*/
@@ -310,7 +310,7 @@ public final class XAConnectionImpl
// We have to expect being called by a ClientConnection that we
// no longer regard as valid. That's acceptable, we just ignore.
if ( clientId != _clientId )
- return ;
+ return;
// If we are handling an underlying connection, we commit the
// old transaction and are ready to work for a new one.
@@ -329,7 +329,7 @@ public final class XAConnectionImpl
event = new ConnectionEvent( this, except );
_listener.connectionErrorOccurred( event );
}
- return ;
+ return;
}
}
// Notify the listener.
@@ -355,7 +355,7 @@ public final class XAConnectionImpl
ConnectionEvent event;
if ( clientId != _clientId )
- return ;
+ return;
// If the connection is not two-phase commit we cannot determine
// whether the error is critical, we just return. If the connection
@@ -364,11 +364,11 @@ public final class XAConnectionImpl
{
if ( ! ( _underlying instanceof TwoPhaseConnection ) ||
! ( (TwoPhaseConnection) _underlying ).isCriticalError( except ) )
- return ;
+ return;
if ( _txConn.conn == null ||
! ( _txConn.conn instanceof TwoPhaseConnection ) ||
! ( (TwoPhaseConnection) _txConn.conn ).isCriticalError( except ) )
- return ;
+ return;
}
// The client connection is no longer useable, the underlying
@@ -766,7 +766,7 @@ public final class XAConnectionImpl
// If connection has been prepared and is read-only,
// nothing to do at this stage.
if ( txConn.readOnly )
- return ;
+ return;
// This must be a one-phase commite, or the connection
// should have been prepared before.
@@ -829,7 +829,7 @@ public final class XAConnectionImpl
// been terminated any other way, nothing to do
// either.
if ( txConn.readOnly || txConn.conn == null )
- return ;
+ return;
try
{
--
GitLab