You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2007/09/25 04:36:48 UTC
svn commit: r579040 - in
/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport:
Channel.java Connection.java Session.java
Author: rhs
Date: Mon Sep 24 19:36:48 2007
New Revision: 579040
URL: http://svn.apache.org/viewvc?rev=579040&view=rev
Log:
improved close handling, made session.sync() return on session close
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java?rev=579040&r1=579039&r2=579040&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java Mon Sep 24 19:36:48 2007
@@ -112,6 +112,10 @@
public void closed()
{
System.out.println("channel closed: " + this);
+ if (session != null)
+ {
+ session.closed();
+ }
}
public void close()
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java?rev=579040&r1=579039&r2=579040&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java Mon Sep 24 19:36:48 2007
@@ -21,6 +21,7 @@
package org.apache.qpidity.transport;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.nio.ByteBuffer;
@@ -94,6 +95,15 @@
public void closed()
{
System.out.println("connection closed: " + this);
+ synchronized (channels)
+ {
+ for (Iterator<Channel> it = channels.values().iterator();
+ it.hasNext(); )
+ {
+ it.next().closed();
+ it.remove();
+ }
+ }
}
public void close()
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java?rev=579040&r1=579039&r2=579040&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java Mon Sep 24 19:36:48 2007
@@ -52,6 +52,8 @@
private Map<Long,Method> commands = new HashMap<Long,Method>();
private long mark = 0;
+ private boolean closed = false;
+
public Map<Long,Method> getOutstandingCommands()
{
@@ -232,7 +234,7 @@
executionSync();
}
- while (!commands.isEmpty())
+ while (!closed && !commands.isEmpty())
{
try {
System.out.println("\n============sync() waiting for commmands to be completed ==============\n");
@@ -244,6 +246,11 @@
throw new RuntimeException(e);
}
}
+
+ if (!commands.isEmpty())
+ {
+ throw new RuntimeException("session closed");
+ }
}
}
@@ -332,6 +339,15 @@
{
sessionClose();
channel.close();
+ }
+
+ public void closed()
+ {
+ synchronized (commands)
+ {
+ closed = true;
+ commands.notifyAll();
+ }
}
}