db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1164359 - in /db/derby/code/branches/10.8: ./ java/engine/org/apache/derby/impl/db/BasicDatabase.java
Date Fri, 02 Sep 2011 06:39:12 GMT
Author: kristwaa
Date: Fri Sep  2 06:39:12 2011
New Revision: 1164359

URL: http://svn.apache.org/viewvc?rev=1164359&view=rev
Log:
DERBY-5390: NPE in BasicDatabase.stop in replication slave mode (dd.clearSequenceCaches)

Merged fix from trunk (revision 1164358).

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/db/BasicDatabase.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Sep  2 06:39:12 2011
@@ -7,4 +7,4 @@ javadoc
 junit_*
 generated
 release
-
+.build.xml.swp

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 06:39:12 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1161208
+/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1161208,1164358

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/db/BasicDatabase.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/db/BasicDatabase.java?rev=1164359&r1=1164358&r2=1164359&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/db/BasicDatabase.java (original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/db/BasicDatabase.java Fri
Sep  2 06:39:12 2011
@@ -241,13 +241,16 @@ public class BasicDatabase implements Mo
     }
 
 	public void stop() {
-        try {
-            // on orderly shutdown, try not to leak unused numbers from the sequence generators.
-            dd.clearSequenceCaches();
-        }
-        catch (Throwable t)
-        {
-            t.printStackTrace(Monitor.getStream().getPrintWriter());
+        // The data dictionary is not available if this database has the
+        // role as an active replication slave database.
+        if (dd != null) {
+            try {
+                // on orderly shutdown, try not to leak unused numbers from
+                // the sequence generators.
+                dd.clearSequenceCaches();
+            } catch (StandardException se) {
+                se.printStackTrace(Monitor.getStream().getPrintWriter());
+            }
         }
 		active = false;
 	}



Mime
View raw message