harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r436665 - in /incubator/harmony/enhanced/classlib/trunk/modules/sql: ./ src/main/java/java/sql/ src/test/java/org/apache/harmony/sql/tests/java/sql/ src/test/resources/ src/test/resources/serialization/ src/test/resources/serialization/org/...
Date Fri, 25 Aug 2006 05:23:49 GMT
Author: smishura
Date: Thu Aug 24 22:23:48 2006
New Revision: 436665

URL: http://svn.apache.org/viewvc?rev=436665&view=rev
Log:
Apply modified patch for HARMONY-1273 ([classlib][sql] java.sql.SQLException does not comply
with the "serialization form")

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/apache/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/apache/harmony/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/apache/harmony/sql/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser
  (with props)
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=436665&r1=436664&r2=436665&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml Thu Aug 24 22:23:48 2006
@@ -100,7 +100,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-            <classpath location="../../build/tests" />
+            <classpath location="${hy.hdk}/build/test/support.jar" />
         </javac>
     </target>
 
@@ -125,6 +125,8 @@
 
             <classpath>
                 <pathelement path="${hy.sql.bin.test}"/>
+                <pathelement path="${hy.sql.src.test.resources}"/>
+                <pathelement path="${hy.hdk}/build/test/support.jar"/>
             </classpath>
             <classpath location="../../build/tests" />
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java?rev=436665&r1=436664&r2=436665&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java
Thu Aug 24 22:23:48 2006
@@ -1,4 +1,4 @@
-/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+/* Copyright 2004, 2006 The Apache Software Foundation or its licensors, as applicable
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,9 +44,9 @@
 
     private String SQLState = null;
 
-    private int errorCode = 0;
+    private int vendorCode = 0;
 
-    private SQLException chainedException = null;
+    private SQLException next = null;
 
     /**
      * Creates an SQLException object. The Reason string is set to null, the
@@ -97,7 +97,7 @@
     public SQLException(String theReason, String theSQLState, int theErrorCode) {
         super(theReason);
         SQLState = theSQLState;
-        errorCode = theErrorCode;
+        vendorCode = theErrorCode;
     }
 
     /**
@@ -107,7 +107,7 @@
      *         code is specific to the vendor of the database.
      */
     public int getErrorCode() {
-        return errorCode;
+        return vendorCode;
     }
 
     /**
@@ -117,7 +117,7 @@
      *         no SQLException chained to this SQLException.
      */
     public SQLException getNextException() {
-        return chainedException;
+        return next;
     }
 
     /**
@@ -143,6 +143,6 @@
      *            the SQLException to chain to this SQLException
      */
     public void setNextException(SQLException ex) {
-        chainedException = ex;
+        next = ex;
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java?rev=436665&r1=436664&r2=436665&view=diff
==============================================================================
Binary files /tmp/tmpHoNhV0 and /tmp/tmpEaR87i differ

Added: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser?rev=436665&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message