qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r796061 - in /qpid/branches/java-broker-0-10/qpid/java: broker/src/main/java/org/apache/qpid/server/transport/ common/src/main/java/org/apache/qpid/transport/ common/src/main/java/org/apache/qpid/transport/network/
Date Mon, 20 Jul 2009 23:14:31 GMT
Author: rgodfrey
Date: Mon Jul 20 23:14:31 2009
New Revision: 796061

URL: http://svn.apache.org/viewvc?rev=796061&view=rev
Log:
Updated to fix sync issues

Modified:
    qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
    qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
    qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java

Modified: qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java?rev=796061&r1=796060&r2=796061&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
Mon Jul 20 23:14:31 2009
@@ -50,11 +50,23 @@
     }
 
     @Override
+    public void command(Session session, Method method)
+    {
+        super.command(session, method);
+        if (method.isSync())
+        {
+            session.flushProcessed();
+        }
+    }
+
+    @Override
     public void messageAccept(Session session, MessageAccept method)
     {
         super.messageAccept(session, method);
     }
 
+
+
     @Override
     public void messageReject(Session session, MessageReject method)
     {
@@ -131,9 +143,6 @@
 
             ((ServerSession) ssn).enqueue(message, queues);
 
-
-            System.out.println(queues);
-
             ssn.processed(xfr);
         }
         catch (AMQException e)

Modified: qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java?rev=796061&r1=796060&r2=796061&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
Mon Jul 20 23:14:31 2009
@@ -76,7 +76,7 @@
         return sync;
     }
 
-    final void setSync(boolean value)
+    public final void setSync(boolean value)
     {
         this.sync = value;
     }

Modified: qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java?rev=796061&r1=796060&r2=796061&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
Mon Jul 20 23:14:31 2009
@@ -186,8 +186,9 @@
         case COMMAND:
             int commandType = dec.readUint16();
             // read in the session header, right now we don't use it
-            dec.readUint16();
+            int hdr = dec.readUint16();
             command = Method.create(commandType);
+            command.setSync((0x0001 & hdr) != 0);
             command.read(dec);
             if (command.hasPayload())
             {



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message