You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2009/06/29 14:56:03 UTC
svn commit: r789313 - in /db/derby/code/trunk/java:
build/org/apache/derbyBuild/ client/org/apache/derby/client/am/
client/org/apache/derby/client/net/ engine/org/apache/derby/catalog/
engine/org/apache/derby/iapi/store/raw/
Author: kahatlen
Date: Mon Jun 29 12:56:03 2009
New Revision: 789313
URL: http://svn.apache.org/viewvc?rev=789313&view=rev
Log:
DERBY-4293: Mutable public static variables
Patch contributed by Sebb <se...@apache.org>.
Modified:
db/derby/code/trunk/java/build/org/apache/derbyBuild/propertyconfig.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java
db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/propertyconfig.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/propertyconfig.java?rev=789313&r1=789312&r2=789313&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/propertyconfig.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/propertyconfig.java Mon Jun 29 12:56:03 2009
@@ -60,12 +60,12 @@
public class propertyconfig {
- public static String header =
+ public static final String header =
"######## This is a generated file, do not edit.\n" +
"#\n# This file is generated as by propertyConfig\n" +
"#\n";
- public static String footer =
+ public static final String footer =
"\n######## This is a generated file, do not edit.\n";
public static void main(String[] args) throws IOException
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java?rev=789313&r1=789312&r2=789313&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java Mon Jun 29 12:56:03 2009
@@ -87,7 +87,7 @@
protected SqlException nextException_;
protected Throwable throwable_;
- public static String CLIENT_MESSAGE_RESOURCE_NAME =
+ public static final String CLIENT_MESSAGE_RESOURCE_NAME =
"org.apache.derby.loc.clientmessages";
//SQLException factory initialised with default factory
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java?rev=789313&r1=789312&r2=789313&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java Mon Jun 29 12:56:03 2009
@@ -185,11 +185,11 @@
static final int USRID_MAXSIZE = 255;
// Product id of the ClientDNC.
- public static String PRDID;
+ public static final String PRDID;
// The server release level of this product.
// It will be prefixed with PRDID
- static String SRVRLSLV;
+ static final String SRVRLSLV;
// Initialize PRDID and SRVRLSLV
static {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java?rev=789313&r1=789312&r2=789313&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java Mon Jun 29 12:56:03 2009
@@ -92,7 +92,7 @@
* <code>SQLERRMC_MESSAGE_DELIMITER</code> When message argument tokes are sent,
* this value separates the tokens for mulitiple error messages
*/
- public static String SQLERRMC_MESSAGE_DELIMITER = new String(new char[] {(char)20,(char)20,(char)20});
+ public static final String SQLERRMC_MESSAGE_DELIMITER = new String(new char[] {(char)20,(char)20,(char)20});
/**
Method used by Derby Network Server to get localized message (original call
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java?rev=789313&r1=789312&r2=789313&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java Mon Jun 29 12:56:03 2009
@@ -44,13 +44,13 @@
private final int compat;
// Names of locks for virtual lock table print out
- private static String[] shortnames = { "S", "S", "U", "U", "X", "X", "X", "X" };
+ private static final String[] shortnames = { "S", "S", "U", "U", "X", "X", "X", "X" };
/** Number of row locks. */
public static final int R_NUMBER = 8;
/** Row lock compatibility table. */
- public static final boolean[][] R_COMPAT = {
+ private static final boolean[][] R_COMPAT = {
// Granted
// Request RS2 RS3 RU2 RU3 RIP RI RX2 RX3
//