db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1164378 - in /db/derby/code/branches/10.8: ./ java/engine/org/apache/derby/impl/io/VFMemoryStorageFactory.java
Date Fri, 02 Sep 2011 07:28:02 GMT
Author: kristwaa
Date: Fri Sep  2 07:28:02 2011
New Revision: 1164378

URL: http://svn.apache.org/viewvc?rev=1164378&view=rev
Log:
DERBY-5393: Remove old in-memory database purge mechanism

Merged fix from trunk (revision 1164370).

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

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 07:28:02 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,1164358
+/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,1164370

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=1164378&r1=1164377&r2=1164378&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
Fri Sep  2 07:28:02 2011
@@ -63,26 +63,6 @@ public class VFMemoryStorageFactory
      */
     private static final DataStore DUMMY_STORE = new DataStore("::DUMMY::");
 
-    /**
-     * TODO: Remove this method once the new mechanism has been added.
-     * Deletes the database if it exists.
-     *
-     * @param dbName the database name
-     * @return {@code true} if the database was deleted, {@code false} otherwise
-     */
-    public static boolean purgeDatabase(final String dbName) {
-        // TODO: Should we check if the database is booted / active?
-        synchronized (DATABASES) {
-            DataStore store = (DataStore)DATABASES.remove(dbName);
-            if (store != null) {
-                // Delete everything.
-                store.purge();
-                return true;
-            }
-            return false;
-        }
-    }
-
     /** The canonical (unique) name of the database (absolute path). */
     private String canonicalName;
     /** The data directory of the database. */
@@ -329,7 +309,6 @@ public class VFMemoryStorageFactory
      */
     public void sync(OutputStream stream, boolean metaData) {
         // Does nothing, data is stored only in memory.
-        // TODO: Are there any streams that needs to be flushed?
     }
 
     public boolean supportsWriteSync() {
@@ -347,7 +326,7 @@ public class VFMemoryStorageFactory
      * @throws NullPointerException if {@code file} is {@code null}
      */
     private String normalizePath(String dir, String file) {
-        if (dir == null || dir.equals("")) {
+        if (dir == null || dir.length() == 0) {
             dir = dataDirectory.getPath();
         } else if (!new File(dir).isAbsolute()) {
             dir = new File(dataDirectory.getPath(), dir).getPath();
@@ -364,7 +343,7 @@ public class VFMemoryStorageFactory
      * @return A path.
      */
     private String normalizePath(String path) {
-        if (path == null || path.equals("")) {
+        if (path == null || path.length() == 0) {
             return dataDirectory.getPath();
         } else if (new File(path).isAbsolute()) {
             return path;



Mime
View raw message