db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1050000 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Date Thu, 16 Dec 2010 15:17:03 GMT
Author: dag
Date: Thu Dec 16 15:16:14 2010
New Revision: 1050000

URL: http://svn.apache.org/viewvc?rev=1050000&view=rev
Log:
DERBY-4944 Embedded Derby does not start when derby.jar is dynamically uploaded / added to
the classpath

Patch BDFF.diff which checks if SourceCode#getLocation is null before
trying to access it. It turns out that in certain cases the location
may be null.

Patch supplied by michi at groiss dot com.


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1050000&r1=1049999&r2=1050000&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Thu Dec 16 15:16:14 2010
@@ -2171,7 +2171,7 @@ public class BaseDataFileFactory
                   return se.getMessage();
               }
   
-              if ( cs == null )
+              if ( cs == null || cs.getLocation() == null )
                   return null;        
       
               URL result = cs.getLocation ();



Mime
View raw message