qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1291792 - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java test-profiles/python_tests/Java010PythonExcludes
Date Tue, 21 Feb 2012 14:11:16 GMT
Author: rgodfrey
Date: Tue Feb 21 14:11:15 2012
New Revision: 1291792

URL: http://svn.apache.org/viewvc?rev=1291792&view=rev
Log:
QPID-3594 : Python exclusive queue declaration test fails against Java Broker

Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
    qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java?rev=1291792&r1=1291791&r2=1291792&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
Tue Feb 21 14:11:15 2012
@@ -199,6 +199,10 @@ public class ServerSessionDelegate exten
                 {
                     exception(session,method,ExecutionErrorCode.RESOURCE_LOCKED, "Exclusive
Queue: " + queueName + " owned exclusively by another session");
                 }
+                else if(queue.isExclusive() && queue.getExclusiveOwningSession()
!= null && queue.getExclusiveOwningSession() != session)
+                {
+                    exception(session,method,ExecutionErrorCode.RESOURCE_LOCKED, "Exclusive
Queue: " + queueName + " owned exclusively by another session");
+                }
                 else
                 {
                     if(queue.isExclusive())
@@ -221,7 +225,6 @@ public class ServerSessionDelegate exten
                                 }
                             });
                         }
-
                     }
 
                     FlowCreditManager_0_10 creditManager = new WindowCreditManager(0L,0L);
@@ -1149,6 +1152,10 @@ public class ServerSessionDelegate exten
                 {
                     exception(session,method,ExecutionErrorCode.RESOURCE_LOCKED, "Exclusive
Queue: " + queueName + " owned exclusively by another session");
                 }
+                else if(queue.isExclusive() && queue.getExclusiveOwningSession()
 != null && queue.getExclusiveOwningSession() != session)
+                {
+                    exception(session,method,ExecutionErrorCode.RESOURCE_LOCKED, "Exclusive
Queue: " + queueName + " owned exclusively by another session");
+                }
                 else if (method.getIfEmpty() && !queue.isEmpty())
                 {
                     exception(session, method, ExecutionErrorCode.PRECONDITION_FAILED, "Queue
" + queueName + " not empty");

Modified: qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes?rev=1291792&r1=1291791&r2=1291792&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes Tue Feb 21 14:11:15
2012
@@ -63,9 +63,6 @@ qpid_tests.broker_0_10.message.MessageTe
 #QPID-3605 Durable subscriber with no-local true receives messages on re-connection
 qpid_tests.broker_0_10.message.MessageTests.test_no_local_awkward
 
-#QPID-3594 exclusive queues problem
-qpid_tests.broker_0_10.queue.QueueTests.test_declare_exclusive
-
 #QPID-3595 Alternate Exchanges support requires work to be spec compliant.
 qpid_tests.broker_0_10.alternate_exchange.AlternateExchangeTests.test_delete_while_used_by_queue
 qpid_tests.broker_0_10.alternate_exchange.AlternateExchangeTests.test_modify_existing_exchange_alternate



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


Mime
View raw message