You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/11/09 00:31:54 UTC

svn commit: r1637609 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ broker-core/src/main/java/org/apache/qpid/server/store/ broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/

Author: rgodfrey
Date: Sat Nov  8 23:31:54 2014
New Revision: 1637609

URL: http://svn.apache.org/r1637609
Log:
QPID-6221 : [Java Broker] Fix existing bug in getStoreLocation() in provided stores, remove unneeded extra Event enums

Modified:
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
    qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java
    qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java?rev=1637609&r1=1637608&r2=1637609&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java Sat Nov  8 23:31:54 2014
@@ -565,7 +565,7 @@ public class BDBConfigurationStore imple
         @Override
         public String getStoreLocation()
         {
-            return ((FileBasedSettings)_parent).getStorePath();
+            return ((FileBasedSettings)(BDBConfigurationStore.this._parent)).getStorePath();
         }
 
         @Override

Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java?rev=1637609&r1=1637608&r2=1637609&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java Sat Nov  8 23:31:54 2014
@@ -22,7 +22,5 @@ package org.apache.qpid.server.store;
 public enum Event
 {
     PERSISTENT_MESSAGE_SIZE_OVERFULL,
-    PERSISTENT_MESSAGE_SIZE_UNDERFULL,
-    FILESYSTEM_OVERFULL,
-    FILESYSTEM_UNDERFULL
+    PERSISTENT_MESSAGE_SIZE_UNDERFULL
 }

Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java?rev=1637609&r1=1637608&r2=1637609&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java Sat Nov  8 23:31:54 2014
@@ -217,7 +217,7 @@ public class DerbyConfigurationStore ext
         @Override
         public String getStoreLocation()
         {
-            return ((FileBasedSettings)_parent).getStorePath();
+            return ((FileBasedSettings)(DerbyConfigurationStore.this._parent)).getStorePath();
         }
 
         @Override



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org