You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2008/11/20 17:47:12 UTC
svn commit: r719279 -
/incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/filters/KeepAlive.java
Author: sccomer
Date: Thu Nov 20 08:47:12 2008
New Revision: 719279
URL: http://svn.apache.org/viewvc?rev=719279&view=rev
Log:
fix for etch-18: KeepAlive throws exception while trying to shutdown connection.
Modified:
incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/filters/KeepAlive.java
Modified: incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/filters/KeepAlive.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/filters/KeepAlive.java?rev=719279&r1=719278&r2=719279&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/filters/KeepAlive.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/filters/KeepAlive.java Thu Nov 20 08:47:12 2008
@@ -25,7 +25,6 @@
import etch.bindings.java.transport.TransportMessage;
import etch.util.AlarmListener;
import etch.util.AlarmManager;
-import etch.util.Log;
import etch.util.Resources;
import etch.util.Timer;
import etch.util.URL;
@@ -166,6 +165,7 @@
protected boolean sessionUp()
{
// Log.report( "KeepAliveSessionUp", "server", server );
+ up = true;
AlarmManager.staticAdd( this, null, delay*1000 );
tickle();
return true;
@@ -175,10 +175,13 @@
protected boolean sessionDown()
{
// Log.report( "KeepAliveSessionDown", "server", server );
+ up = false;
AlarmManager.staticRemove( this );
return true;
}
+ private boolean up;
+
private void handleRequest( Message msg )
{
if (!server)
@@ -188,7 +191,7 @@
return;
}
- Log.report( "GotKeepAliveReq", "msg", msg );
+// Log.report( "GotKeepAliveReq", "msg", msg );
Number d = (Number) msg.get( mf_delay );
if (d != null && d.intValue() > 0)
@@ -219,7 +222,7 @@
return;
}
- Log.report( "GotKeepAliveResp", "msg", msg );
+// Log.report( "GotKeepAliveResp", "msg", msg );
tickle();
}
@@ -265,7 +268,7 @@
msg.put( mf_count, count );
try
{
- Log.report( "SendKeepAliveReq", "msg", msg );
+// Log.report( "SendKeepAliveReq", "msg", msg );
transport.transportMessage( null, msg );
}
catch ( Exception e )
@@ -287,7 +290,7 @@
Message rmsg = msg.reply();
try
{
- Log.report( "SendKeepAliveResp", "rmsg", rmsg );
+// Log.report( "SendKeepAliveResp", "rmsg", rmsg );
transport.transportMessage( null, rmsg );
}
catch ( Exception e )
@@ -308,6 +311,9 @@
{
// Log.report( "KeepAliveWakeup", "server", server );
+ if (!up)
+ return 0;
+
if (!server)
sendKeepAliveReq();
@@ -331,6 +337,4 @@
{
return count;
}
-
-
}