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 ma...@apache.org on 2012/10/08 20:42:38 UTC
svn commit: r1395712 - in /db/derby/code/branches/10.6: ./
java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Author: mamta
Date: Mon Oct 8 18:42:38 2012
New Revision: 1395712
URL: http://svn.apache.org/viewvc?rev=1395712&view=rev
Log:
DERBY-5916 (java.lang.NullPointerException org.apache.derby.impl.store.raw.data.BaseDataFileFactory.stop() connecting to network server)
backporting to 10.6
Modified:
db/derby/code/branches/10.6/ (props changed)
db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1394883
Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1395712&r1=1395711&r2=1395712&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java (original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java Mon Oct 8 18:42:38 2012
@@ -546,7 +546,8 @@ public class BaseDataFileFactory
if (isReadOnly()) // do enough to close all files, then return
{
- storageFactory.shutdown();
+ if (storageFactory != null)
+ storageFactory.shutdown();
return;
}
@@ -1643,15 +1644,18 @@ public class BaseDataFileFactory
*/
private synchronized void removeStubs()
{
- actionCode = REMOVE_STUBS_ACTION;
- try
+ if( storageFactory != null)
{
- AccessController.doPrivileged( this);
+ actionCode = REMOVE_STUBS_ACTION;
+ try
+ {
+ AccessController.doPrivileged( this);
+ }
+ catch (PrivilegedActionException pae)
+ {
+ // removeStubs does not throw an exception
+ }
}
- catch (PrivilegedActionException pae)
- {
- // removeStubs does not throw an exception
- }
}
/**