Change 'return ;' to 'return;'; remove space.

bmomjian · bmomjian · commit 28e92b89f49b · 2001-11-19T23:19:21.000Z
diff --git a/src/interfaces/jdbc/example/Unicode.java b/src/interfaces/jdbc/example/Unicode.java
@@ -234,7 +234,7 @@ public void runTest()
 		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
@@ -9,7 +9,7 @@
  *
  * 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 StockClient(String[] args)
 			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 StockClient(String[] args)
 			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
@@ -5,7 +5,7 @@
 /*
  * 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 void releaseItem(stock.StockItem item) throws stock.StockException
 			{
 				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
@@ -5,7 +5,7 @@
 /*
  * 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 static void main(String[] args)
 			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
@@ -82,7 +82,7 @@ public void processLine(String line) throws SQLException
 		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
@@ -11,7 +11,7 @@
 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 boolean isReadOnly() throws SQLException
 	public void setAutoCommit(boolean autoCommit) throws SQLException
 	{
 		if (this.autoCommit == autoCommit)
-			return ;
+			return;
 		if (autoCommit)
 			ExecSQL("end");
 		else
@@ -860,7 +860,7 @@ public boolean getAutoCommit() throws SQLException
 	public void commit() throws SQLException
 	{
 		if (autoCommit)
-			return ;
+			return;
 		if (haveMinimumServerVersion("7.1"))
 		{
 			ExecSQL("commit;begin;" + getIsolationLevelSQL());
@@ -884,7 +884,7 @@ public void commit() throws SQLException
 	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
@@ -76,7 +76,7 @@ public void release(byte[] b)
 	{
 		// 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
@@ -42,7 +42,7 @@ public void release(byte[][] b)
 	{
 		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
@@ -83,7 +83,7 @@ public void addAll(ObjectPool p)
 
 		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
@@ -613,7 +613,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale
 		if (x == null)
 		{
 			setNull(parameterIndex, Types.OTHER);
-			return ;
+			return;
 		}
 		switch (targetSqlType)
 		{
@@ -683,7 +683,7 @@ public void setObject(int parameterIndex, Object x) throws SQLException
 		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
@@ -648,7 +648,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale
 		if (x == null)
 		{
 			setNull(parameterIndex, Types.OTHER);
-			return ;
+			return;
 		}
 		switch (targetSqlType)
 		{
@@ -718,7 +718,7 @@ public void setObject(int parameterIndex, Object x) throws SQLException
 		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
@@ -485,7 +485,7 @@ public static void create(org.postgresql.Connection con, Class c) throws SQLExce
 		{
 			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
@@ -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 @@ public synchronized void close()
 	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
@@ -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 @@ synchronized void notifyClose( int clientId )
 		// 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 @@ synchronized void notifyClose( int clientId )
 					event = new ConnectionEvent( this, except );
 					_listener.connectionErrorOccurred( event );
 				}
-				return ;
+				return;
 			}
 		}
 		// Notify the listener.
@@ -355,7 +355,7 @@ synchronized void notifyError( int clientId, SQLException except )
 		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 @@ synchronized void notifyError( int clientId, SQLException except )
 		{
 			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 synchronized void commit( Xid xid, boolean onePhase )
 			// 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 synchronized void rollback( Xid xid )
 			// been terminated any other way, nothing to do
 			// either.
 			if ( txConn.readOnly || txConn.conn == null )
-				return ;
+				return;
 
 			try
 			{

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ public void runTest()`
`234`	`234`	`catch (ClassNotFoundException cnfe)`
`235`	`235`	`{`
`236`	`236`	`log("Unable to load driver", cnfe);`
`237`		`- return ;`
	`237`	`+ return;`
`238`	`238`	`}`
`239`	`239`	`try`
`240`	`240`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* It has no GUI, just a text frontend to keep it simple.`
`11`	`11`	`*`
`12`		`- * $Id: StockClient.java,v 1.4 2001/11/19 23:16:45 momjian Exp $`
	`12`	`+ * $Id: StockClient.java,v 1.5 2001/11/19 23:19:20 momjian Exp $`
`13`	`13`	`*/`
`14`	`14`	`public class StockClient`
`15`	`15`	`{`
`@@ -35,14 +35,14 @@ public StockClient(String[] args)`
`35`	`35`	`if (nameServiceObj == null)`
`36`	`36`	`{`
`37`	`37`	`System.err.println("nameServiceObj == null");`
`38`		`- return ;`
	`38`	`+ return;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`nameService = org.omg.CosNaming.NamingContextHelper.narrow(nameServiceObj);`
`42`	`42`	`if (nameService == null)`
`43`	`43`	`{`
`44`	`44`	`System.err.println("nameService == null");`
`45`		`- return ;`
	`45`	`+ return;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`// Resolve the dispenser`
`@@ -53,7 +53,7 @@ public StockClient(String[] args)`
`53`	`53`	`if (dispenser == null)`
`54`	`54`	`{`
`55`	`55`	`System.err.println("dispenser == null");`
`56`		`- return ;`
	`56`	`+ return;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// Now run the front end.`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`/*`
`6`	`6`	`* This class implements the server side of the example.`
`7`	`7`	`*`
`8`		`- * $Id: StockDispenserImpl.java,v 1.3 2001/11/19 22:43:13 momjian Exp $`
	`8`	`+ * $Id: StockDispenserImpl.java,v 1.4 2001/11/19 23:19:20 momjian Exp $`
`9`	`9`	`*/`
`10`	`10`	`public class StockDispenserImpl extends stock._StockDispenserImplBase`
`11`	`11`	`{`
`@@ -67,11 +67,11 @@ public void releaseItem(stock.StockItem item) throws stock.StockException`
`67`	`67`	`{`
`68`	`68`	`stock[i].inUse = false;`
`69`	`69`	`System.out.println("Releasing slot " + i);`
`70`		`- return ;`
	`70`	`+ return;`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`System.out.println("Reserved object not a member of this dispenser");`
`74`		`- return ;`
	`74`	`+ return;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public void processLine(String line) throws SQLException`
`82`	`82`	`if (line.startsWith("\\"))`
`83`	`83`	`{`
`84`	`84`	`processSlashCommand(line);`
`85`		`- return ;`
	`85`	`+ return;`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`boolean type = st.execute(line);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`import org.postgresql.core.*;`
`12`	`12`
`13`	`13`	`/*`
`14`		`- * $Id: Connection.java,v 1.37 2001/11/19 23:16:45 momjian Exp $`
	`14`	`+ * $Id: Connection.java,v 1.38 2001/11/19 23:19:20 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* This abstract class is used by org.postgresql.Driver to open either the JDBC1 or`
`17`	`17`	`* JDBC2 versions of the Connection class.`
`@@ -817,7 +817,7 @@ public boolean isReadOnly() throws SQLException`
`817`	`817`	`public void setAutoCommit(boolean autoCommit) throws SQLException`
`818`	`818`	`{`
`819`	`819`	`if (this.autoCommit == autoCommit)`
`820`		`- return ;`
	`820`	`+ return;`
`821`	`821`	`if (autoCommit)`
`822`	`822`	`ExecSQL("end");`
`823`	`823`	`else`
`@@ -860,7 +860,7 @@ public boolean getAutoCommit() throws SQLException`
`860`	`860`	`public void commit() throws SQLException`
`861`	`861`	`{`
`862`	`862`	`if (autoCommit)`
`863`		`- return ;`
	`863`	`+ return;`
`864`	`864`	`if (haveMinimumServerVersion("7.1"))`
`865`	`865`	`{`
`866`	`866`	`ExecSQL("commit;begin;" + getIsolationLevelSQL());`
`@@ -884,7 +884,7 @@ public void commit() throws SQLException`
`884`	`884`	`public void rollback() throws SQLException`
`885`	`885`	`{`
`886`	`886`	`if (autoCommit)`
`887`		`- return ;`
	`887`	`+ return;`
`888`	`888`	`if (haveMinimumServerVersion("7.1"))`
`889`	`889`	`{`
`890`	`890`	`ExecSQL("rollback; begin;" + getIsolationLevelSQL());`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public void release(byte[] b)`
`76`	`76`	`{`
`77`	`77`	`// If it's larger than maxsize then we don't touch it`
`78`	`78`	`if (b.length > maxsize)`
`79`		`- return ;`
	`79`	`+ return;`
`80`	`80`
`81`	`81`	`ObjectPool not_usel = notusemap[b.length];`
`82`	`82`	`ObjectPool in_usel = inusemap[b.length];`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public void release(byte[][] b)`
`42`	`42`	`{`
`43`	`43`	`if (b.length > maxsize)`
`44`	`44`	`{`
`45`		`- return ;`
	`45`	`+ return;`
`46`	`46`	`}`
`47`	`47`	`ObjectPool not_usel = notusemap[b.length];`
`48`	`48`	`ObjectPool in_usel = inusemap[b.length];`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public void addAll(ObjectPool p)`
`83`	`83`
`84`	`84`	`int srcsize = pool.size();`
`85`	`85`	`if (srcsize == 0)`
`86`		`- return ;`
	`86`	`+ return;`
`87`	`87`	`int totalsize = srcsize + cursize;`
`88`	`88`	`if (totalsize > maxsize)`
`89`	`89`	`{`
Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale`
`613`	`613`	`if (x == null)`
`614`	`614`	`{`
`615`	`615`	`setNull(parameterIndex, Types.OTHER);`
`616`		`- return ;`
	`616`	`+ return;`
`617`	`617`	`}`
`618`	`618`	`switch (targetSqlType)`
`619`	`619`	`{`
`@@ -683,7 +683,7 @@ public void setObject(int parameterIndex, Object x) throws SQLException`
`683`	`683`	`if (x == null)`
`684`	`684`	`{`
`685`	`685`	`setNull(parameterIndex, Types.OTHER);`
`686`		`- return ;`
	`686`	`+ return;`
`687`	`687`	`}`
`688`	`688`	`if (x instanceof String)`
`689`	`689`	`setString(parameterIndex, (String)x);`