db-derby-commits mailing list archives

Author: bandaram
Date: Thu Jun  2 16:52:45 2005
New Revision: 179674

URL: http://svn.apache.org/viewcvs?rev=179674&view=rev
Log:
Derby-318: Prevent network server from hitting NullPointerException.

Submitted by Tomohito Nakayama. (tomonaka@basil.ocn.ne.jp) 

Added:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out
  (with props)
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out
  (with props)
Modified:
    incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/syscat.sql

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java?rev=179674&r1=179673&r2=179674&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
Thu Jun  2 16:52:45 2005
@@ -87,6 +87,9 @@
 
 	public String	toString()
 	{
+		if(isDefaultValueAutoinc()){
+			return "GENERATED_BY_DEFAULT";
+		}
 		return defaultText;
 	}