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 2016/09/28 09:02:09 UTC
svn commit: r1762621 - in /qpid/java/trunk: bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/ broker-core/src/main/java/org/apache/qpid/server/model/ broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/ broker-core/...

Author: rgodfrey
Date: Wed Sep 28 09:02:09 2016
New Revision: 1762621

URL: http://svn.apache.org/viewvc?rev=1762621&view=rev
Log:
QPID-7379 : fix writeInt bug in previous commit, and rename "extractMessageStore" to "exportMessageStore"

Added:
    qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java
      - copied, changed from r1762620, qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExtractImportMessagesRestTest.java
Removed:
    qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExtractImportMessagesRestTest.java
Modified:
    qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Serializer.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java?rev=1762621&r1=1762620&r2=1762621&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java Wed Sep 28 09:02:09 2016
@@ -462,7 +462,7 @@ public class BDBHAReplicaVirtualHostImpl
     }
 
     @Override
-    public Content extractMessageStore()
+    public Content exportMessageStore()
     {
         throwUnsupportedForReplica();
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1762621&r1=1762620&r2=1762621&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java Wed Sep 28 09:02:09 2016
@@ -221,7 +221,7 @@ public interface VirtualHost<X extends V
                                                           + "confidential information",
                                             defaultValue = "false") boolean includeSecureAttributes);
     @ManagedOperation(nonModifying = true, description = "Extract message store content", secure = true)
-    Content extractMessageStore();
+    Content exportMessageStore();
 
     @ManagedOperation(description = "Import message store content", secure = true)
     void importMessageStore(@Param(name="source", description = "Extract file")String source);

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Serializer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Serializer.java?rev=1762621&r1=1762620&r2=1762621&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Serializer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Serializer.java Wed Sep 28 09:02:09 2016
@@ -57,10 +57,10 @@ class Serializer
     public final void writeInt(long val) throws IOException
     {
 
-        _tmpBuf[4] = (byte)(val >>> 24);
-        _tmpBuf[5] = (byte)(val >>> 16);
-        _tmpBuf[6] = (byte)(val >>>  8);
-        _tmpBuf[7] = (byte)val;
+        _tmpBuf[0] = (byte)(val >>> 24);
+        _tmpBuf[1] = (byte)(val >>> 16);
+        _tmpBuf[2] = (byte)(val >>>  8);
+        _tmpBuf[3] = (byte)val;
         write(_tmpBuf, 0, 4);
     }
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1762621&r1=1762620&r2=1762621&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Wed Sep 28 09:02:09 2016
@@ -866,7 +866,7 @@ public abstract class AbstractVirtualHos
     }
 
     @Override
-    public Content extractMessageStore()
+    public Content exportMessageStore()
     {
         if(getState() == State.STOPPED)
         {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java?rev=1762621&r1=1762620&r2=1762621&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java Wed Sep 28 09:02:09 2016
@@ -321,7 +321,7 @@ class RedirectingVirtualHostImpl
     }
 
     @Override
-    public Content extractMessageStore()
+    public Content exportMessageStore()
     {
         throwUnsupportedForRedirector();
 

Copied: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java (from r1762620, qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExtractImportMessagesRestTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java?p2=qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java&p1=qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExtractImportMessagesRestTest.java&r1=1762620&r2=1762621&rev=1762621&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExtractImportMessagesRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java Wed Sep 28 09:02:09 2016
@@ -46,7 +46,7 @@ import org.apache.qpid.test.utils.TestBr
 import org.apache.qpid.url.URLSyntaxException;
 import org.apache.qpid.util.DataUrlUtils;
 
-public class ExtractImportMessagesRestTest extends QpidRestTestCase
+public class ExportImportMessagesRestTest extends QpidRestTestCase
 {
     private static final String CONNECTION_URL_TEMPLATE =
             "amqp://guest:guest@clientid/%s?brokerlist='localhost:%d?failover='false''";



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