db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1209228 - in /db/derby/code/branches/10.8: ./ java/engine/org/apache/derby/impl/io/ java/engine/org/apache/derby/io/ java/testing/org/apache/derbyTesting/functionTests/util/corruptio/
Date Thu, 01 Dec 2011 20:30:57 GMT
Author: kmarsden
Date: Thu Dec  1 20:30:56 2011
New Revision: 1209228

URL: http://svn.apache.org/viewvc?rev=1209228&view=rev
Log:
DERBY-5096 DisconnectException: "Connection was refused because the database DB
db for first time


Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java
    db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/VFMemoryStorageFactory.java
    db/derby/code/branches/10.8/java/engine/org/apache/derby/io/StorageFactory.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptBaseStorageFactory.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  1 20:30:56 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,1104365,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,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,
 1181756,1183463,1183503,1183671,1186020,1186691,1189201,1189222,1203252,1204128
+/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,1104365,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,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,
 1181756,1183463,1183503,1183671,1186020,1186691,1189201,1189222,1203050,1203252,1204128,1207729

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java?rev=1209228&r1=1209227&r2=1209228&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java
(original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java
Thu Dec  1 20:30:56 2011
@@ -111,6 +111,15 @@ abstract class BaseStorageFactory implem
     }
     
     /**
+     * Set the canonicalName. May need adjustment due to DERBY-5096
+     * 
+     * @param name uniquely identifiable name for this database
+     */
+    public void setCanonicalName(String name) {
+       canonicalName = name;
+    }
+    
+    /**
      * Construct a StorageFile from a path name.
      *
      * @param path The path name of the file

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/VFMemoryStorageFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/VFMemoryStorageFactory.java?rev=1209228&r1=1209227&r2=1209228&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/VFMemoryStorageFactory.java
(original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/VFMemoryStorageFactory.java
Thu Dec  1 20:30:56 2011
@@ -189,6 +189,15 @@ public class VFMemoryStorageFactory
     }
 
     /**
+     * Set the canonicalName. May need adjustment due to DERBY-5096
+     * 
+     * @param name uniquely identifiable name for this database
+     */
+    public void setCanonicalName(String name) {
+       canonicalName = name;
+    }
+    
+    /**
      * Returns a handle to the specific storage file.
      *
      * @param path the path of the file or directory

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/io/StorageFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/io/StorageFactory.java?rev=1209228&r1=1209227&r2=1209228&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/io/StorageFactory.java (original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/io/StorageFactory.java Thu Dec
 1 20:30:56 2011
@@ -231,4 +231,12 @@ public interface StorageFactory
      */
     public StorageFile createTemporaryFile (String prefix, String suffix)
                                                             throws IOException;
+    
+    /**
+     * Set the canonicalName. May need adjustment due to DERBY-5096
+     * 
+     * @param name uniquely identifiable name for this database
+     */
+    public void setCanonicalName(String name);
+    
 }

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptBaseStorageFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptBaseStorageFactory.java?rev=1209228&r1=1209227&r2=1209228&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptBaseStorageFactory.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptBaseStorageFactory.java
Thu Dec  1 20:30:56 2011
@@ -118,6 +118,15 @@ abstract class CorruptBaseStorageFactory
     }
     
     /**
+     * Set the canonicalName. May need adjustment due to DERBY-5096
+     * 
+     * @param name uniquely identifiable name for this database
+     */
+    public void setCanonicalName(String name) {
+       realStorageFactory.setCanonicalName(name);
+    }
+    
+    /**
      * Construct a StorageFile from a path name.
      *
      * @param path The path name of the file



Mime
View raw message