You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by re...@apache.org on 2010/07/01 05:10:28 UTC

svn commit: r959494 - /harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/common/agent/core/PacketDispatcher.cpp

Author: regisxu
Date: Thu Jul  1 03:10:28 2010
New Revision: 959494

URL: http://svn.apache.org/viewvc?rev=959494&view=rev
Log:
Do not rest modules when "connect" failed in server mode, because session is not
created yet, so that jdwp could wait for further clients.

Modified:
    harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/common/agent/core/PacketDispatcher.cpp

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/common/agent/core/PacketDispatcher.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/common/agent/core/PacketDispatcher.cpp?rev=959494&r1=959493&r2=959494&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/common/agent/core/PacketDispatcher.cpp (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/common/agent/core/PacketDispatcher.cpp Thu Jul  1 03:10:28 2010
@@ -90,15 +90,7 @@ PacketDispatcher::Run(JNIEnv *jni)
                 JDWP_TRACE(LOG_RELEASE, (LOG_ERROR_FL, "Run: Exception in connection: %s", aex.GetExceptionMessage(jni)));
                 /* In server case, attempt to reaccept while the VM is alive */
                 if (AgentBase::GetOptionParser().GetServer()) {
-                    ret = ResetAll(jni);
-                    if (ret != JDWP_ERROR_NONE) {
-                        AgentException aex = GetExceptionManager().GetLastException();
-                        JDWP_TRACE(LOG_RELEASE, (LOG_ERROR_FL, "Error calling ResetAll(): %s", aex.GetExceptionMessage(jni)));
-                        if (!IsDead()) {                                            
-                            ::exit(1);
-                        }
-                        break;
-                    }
+                    // do not need to reset modules, because the session is not created yet
                     continue;
                 }
                 ::exit(1);