svn commit: r926600 - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java

[kr...@apache.org]

Author: kristwaa
Date: Tue Mar 23 14:53:17 2010
New Revision: 926600

URL: http://svn.apache.org/viewvc?rev=926600&view=rev
Log:
DERBY-4590: You can drop a file-system database from a directory named "memory".

Fixed low-level logic determining if you are allowed to drop a database or not.
The check is based on substring matching of the protocol part of the database
name.

Patch file: derby-4590-1a-disallow_drop_properly.diff

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java?rev=926600&r1=926599&r2=926600&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java Tue Mar 23 14:53:17 2010
@@ -602,7 +602,7 @@ public class Monitor {
         // This is mostly due to the fact that the current implementation for
         // the on-disk back end doesn't handle logDevice when dropping.
         // Security is another concern.
-        if (!name.startsWith(PersistentService.INMEMORY)) {
+        if (!name.startsWith(PersistentService.INMEMORY + ":")) {
             throw StandardException.newException(
                     SQLState.SERVICE_DIRECTORY_REMOVE_ERROR, name);
         }