harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r794733 - in /harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common: agent/commands/ agent/core/ transport/dt_socket/
Date Thu, 16 Jul 2009 16:22:16 GMT
Author: odeakin
Date: Thu Jul 16 16:22:15 2009
New Revision: 794733

URL: http://svn.apache.org/viewvc?rev=794733&view=rev
Log:
Remove commented code.

Modified:
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/ArrayReference.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/StackFrame.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentEventRequest.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentMonitor.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/EventDispatcher.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ObjectManager.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/PacketParser.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestManager.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestModifier.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ThreadManager.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/TransportManager.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/transport/dt_socket/SocketTransport.cpp

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/ArrayReference.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/ArrayReference.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/ArrayReference.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/ArrayReference.cpp
Thu Jul 16 16:22:15 2009
@@ -465,16 +465,6 @@
                 jni->SetObjectArrayElement(static_cast<jobjectArray>(arrayObject),
firstIndex + i, objArrayElement);
                 jthrowable ex = jni->ExceptionOccurred();
                 
-                // don't check for particular exception
-                /*
-                jclass exClass = jni->FindClass("java/lang/ArrayStoreException");
-                JDWP_ASSERT(exClass != 0);
-                if((ex != 0) && (jni->IsInstanceOf(ex, exClass) == JNI_TRUE))
{
-                    jni->ExceptionClear();
-                    throw AgentException(JDWP_ERROR_INVALID_ARRAY);
-                }
-                */
-
                 // indicate error if any exception occured
                 if (ex != 0) {
                     jni->ExceptionClear();

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/StackFrame.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/StackFrame.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/StackFrame.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/StackFrame.cpp
Thu Jul 16 16:22:15 2009
@@ -193,7 +193,6 @@
         jint slot = m_cmdParser->command.ReadInt();
         jdwpTaggedValue taggedValue = m_cmdParser->command.ReadValue(jni);
         JDWP_TRACE(LOG_RELEASE, (LOG_DATA_FL, "SetValues: slot#%d: taggedValue=%d", i, taggedValue.tag));
-//        jdwpTag sigbyte = taggedValue.tag;
         jvmtiError err = JVMTI_ERROR_NONE;
         switch (taggedValue.tag) {
             case JDWP_TAG_BOOLEAN:

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp
Thu Jul 16 16:22:15 2009
@@ -465,16 +465,6 @@
     exit(static_cast<int>(exitCode));
 
     return JDWP_ERROR_NONE;
-/*
-    // another variant is to call System.exit()
-    ClassManager &clsMgr = AgentBase::GetClassManager();
-    jclass klass = clsMgr.GetSystemClass();
-    jmethodID methodID = jni->GetStaticMethodID(klass, "exit", "(I)V");
-    clsMgr.CheckOnException(jni);
-
-    jni->CallStaticVoidMethod(klass, methodID, exitCode);
-    clsMgr.CheckOnException(jni);
-*/
 }
 
 //-----------------------------------------------------------------------------

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentEventRequest.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentEventRequest.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentEventRequest.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentEventRequest.cpp
Thu Jul 16 16:22:15 2009
@@ -188,14 +188,11 @@
     stratum = ( default_stratum == NULL || strlen(default_stratum) == 0 ) ?
                 tok : default_stratum;
 
-    // printf("Looking for equivalent of java line %d in stratum %s\n",
-    //        lineNumber, stratum);
     while( ( tok = strtok(NULL, "\n") ) ) {
         if (strlen(tok) >= 2) {
             while (tok[0] == '*' && tok[1] == 'S' && tok[2] == ' ') {
                 tok++; tok++;
                 while (tok[0] == ' ' && tok[0] != 0) tok++; // skip spaces
-                // printf("stratum = '%s'\n", tok);
                 if (strcmp(stratum, tok) == 0) {
                     // this is the stratum that is required
                     tok = strtok(NULL, "\n");
@@ -241,7 +238,6 @@
                                     }
                                 }
                             } while (tok[0] != '*');
-                            // puts("No match in stratum line table");
                             return -1;
                         }
                         tok = strtok(NULL, "\n");

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentMonitor.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentMonitor.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentMonitor.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentMonitor.cpp
Thu Jul 16 16:22:15 2009
@@ -32,8 +32,6 @@
 AgentMonitor::~AgentMonitor() {
     jvmtiError err;
     JVMTI_TRACE(LOG_DEBUG, err, AgentBase::GetJvmtiEnv()->DestroyRawMonitor(m_monitor));
-    // check for error only in debug mode
-    //JDWP_ASSERT(err==JVMTI_ERROR_NONE);
 }
 
 void AgentMonitor::Enter() const {

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/EventDispatcher.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/EventDispatcher.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/EventDispatcher.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/EventDispatcher.cpp
Thu Jul 16 16:22:15 2009
@@ -42,11 +42,6 @@
     JDWP_TRACE_ENTRY(LOG_RELEASE, (LOG_FUNC_FL, "Run(%p)", jni));
 
     MonitorAutoLock malCM(m_completeMonitor JDWP_FILE_LINE);
-    /*if (GetExceptionManager().GetLastException() != NULL) {
-        AgentException aex = GetExceptionManager().GetLastException();
-        JDWP_TRACE(LOG_RELEASE, (LOG_ERROR_FL, "Exception in EventDispatcher synchronization:
%s", aex.GetExceptionMessage(jni)));
-        return;
-    }*/
     
     while (!m_stopFlag) {
         EventComposer *ec;

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ObjectManager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ObjectManager.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ObjectManager.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ObjectManager.cpp
Thu Jul 16 16:22:15 2009
@@ -374,42 +374,6 @@
     return JDWP_ERROR_NONE;
 } // EnableCollection()
 
-/*jboolean ObjectManager::IsCollectionDisabled(ObjectID objectID) {
-    JDWP_TRACE_ENTRY(LOG_RELEASE, (LOG_FUNC_FL, "IsCollectionDisabled(%lld)", objectID));
-
-    // decode object ID
-    size_t idx = (size_t)objectID & HASH_TABLE_MSK;
-    objectID = objectID >> HASH_TABLE_IDX;
-
-    //JDWP_ASSERT(m_objectIDTable != &m_DummyObjectIDTable);
-
-    // check decoded object ID
-    if (objectID <= 0 || objectID > m_maxAllocatedObjectID[idx]) {
-        // It is DEBUGGER ERROR: request for ObjectID which was never allocated
-        JDWP_TRACE(LOG_RELEASE, (LOG_MAP_FL, "## IsCollectionDisabled: invalid object ID:
%lld", objectID));
-	AgentException ex(JDWP_ERROR_INVALID_OBJECT);
-	THROW(ex);
-    }
-
-    jboolean result;
-    { // synchronized block: objectIDTableLock
-    MonitorAutoLock objectIDTableLock(m_objectIDTableMonitor JDWP_FILE_LINE);
-    ObjectIDItem* objectIDItem = m_objectIDTable[idx] + objectID - 1;
-    if ( objectIDItem->objectID == FREE_OBJECTID_SIGN ) {
-        // It is DEBUGGER ERROR: Corresponding jobject is DISPOSED
-        JDWP_TRACE(LOG_RELEASE, (LOG_MAP_FL, "## IsCollectionDisabled: corresponding jobject
has been disposed: %lld", objectID));
-	AgentException ex(JDWP_ERROR_INVALID_OBJECT);
-	THROW(ex);
-    }
-    result = JNI_FALSE;
-    if (objectIDItem->mapObjectIDItem.globalRefKind != WEAK_GLOBAL_REF) {
-        result = JNI_TRUE;
-    }
-    } // synchronized block: objectIDTableLock
-
-    return result;
-} // IsCollectionDisabled() */
-
 jboolean ObjectManager::IsCollected(JNIEnv* JNIEnvPtr, ObjectID objectID) {
     JDWP_TRACE_ENTRY(LOG_RELEASE, (LOG_FUNC_FL, "IsCollected(%p,%lld)", JNIEnvPtr, objectID));
 

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/PacketParser.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/PacketParser.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/PacketParser.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/PacketParser.cpp
Thu Jul 16 16:22:15 2009
@@ -221,21 +221,6 @@
     m_position += len;
 }
 
-/*void InputPacketParser::ReadRawData(void* data, int len) {
-    JDWP_ASSERT(IsPacketInitialized());
-
-    if (m_position+len>m_packet.type.cmd.len-JDWP_MIN_PACKET_LENGTH) {
-        AgentException ex(JDWP_ERROR_INTERNAL);
-        THROW(ex);
-    }
-  
-    memcpy(data, &m_packet.type.cmd.data[m_position], len);
-    
-    m_position += len;
-}*/
-
-
-
 jbyte InputPacketParser::ReadByte() {
     jbyte data = 0;
     ReadBigEndianData(&data, sizeof(jbyte));

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestManager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestManager.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestManager.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestManager.cpp
Thu Jul 16 16:22:15 2009
@@ -1075,24 +1075,6 @@
     return ec;
 }
 
-// Unused method
-/*bool RequestManager::IsMethodEntryLocation(JNIEnv* jni, EventInfo& eInfo) 
-   
-{
-    jvmtiError err;
-    jlocation start_location;
-    jlocation end_location;
-    JVMTI_TRACE(LOG_DEBUG, err, GetJvmtiEnv()->GetMethodLocation(eInfo.method, &start_location,
&end_location));
-    if (err != JVMTI_ERROR_NONE) {
-        JDWP_TRACE(LOG_RELEASE, (LOG_INFO_FL, "Error calling GetMethodLocation: %d", err));
-        return false;
-    }    
-    bool isEntry = (start_location == eInfo.location);
-    JDWP_TRACE(LOG_RELEASE, (LOG_EVENT_FL, "IsMethodEntryLocation: isEntry=%s, location=%lld,
start=%lld, end=%lld",
-                     (isEntry?"TRUE":"FALSE"), eInfo.location, start_location, end_location));
-    return isEntry;
-}*/
-
 bool RequestManager::IsMethodExitLocation(JNIEnv* jni, EventInfo& eInfo) 
    
 {
@@ -1762,8 +1744,6 @@
     if (exceptionRequest != 0) {
         GetRequestManager().DeleteRequest(jni, exceptionRequest);
     }
-  /*  JVMTI_TRACE(LOG_DEBUG, err, jvmti->SetEventNotificationMode(
-         JVMTI_ENABLE , JVMTI_EVENT_BREAKPOINT, thread));*/
 }
 
 void JNICALL RequestManager::HandleMethodEntry(jvmtiEnv* jvmti, JNIEnv* jni,

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestModifier.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestModifier.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestModifier.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestModifier.cpp
Thu Jul 16 16:22:15 2009
@@ -122,13 +122,11 @@
                         // skip spaces
                         while (tok[0] == ' ' && tok[0] != 0) tok++;
                         if (tok[0] == 0) break;
-                        //printf("plus name = '%s'\n", tok);
                         if (MatchPatternSourceName(tok, m_pattern)) {
                             return true;
                         }
                         tok = strtok(NULL, "\n");
                         if (tok == NULL) return false;
-                        //printf("full name = '%s'\n", tok);
                         if (MatchPatternSourceName(tok, m_pattern)) {
                             return true;
                         }
@@ -140,7 +138,6 @@
                         // skip spaces
                         while (tok[0] == ' ' && tok[0] != 0) tok++;
                         if (tok[0] == 0) break;
-                        //printf("file name = '%s'\n", tok);
                         if (MatchPatternSourceName(tok, m_pattern)) {
                             return true;
                         }

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ThreadManager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ThreadManager.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ThreadManager.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ThreadManager.cpp
Thu Jul 16 16:22:15 2009
@@ -924,8 +924,6 @@
 bool
 ThreadManager::IsAgentThread(JNIEnv *jni, jthread thread)
 {
-    //JDWP_TRACE_ENTRY(LOG_RELEASE, (LOG_FUNC_FL, "IsAgentThread(%p,%d)", jni, thread));
-
     MonitorAutoLock lock(m_thrdmgrMonitor JDWP_FILE_LINE);
 
     bool ret_value = false;
@@ -1001,8 +999,6 @@
 jint
 ThreadManager::GetSuspendCount(JNIEnv *jni, jthread thread)
 {
-    //JDWP_TRACE_ENTRY(LOG_RELEASE, (LOG_FUNC_FL, "GetSuspendCount(%p,%d)", jni, thread));
-
     MonitorAutoLock lock(m_thrdmgrMonitor JDWP_FILE_LINE);
 
     jint ret_value = 0;
@@ -1022,8 +1018,6 @@
 bool
 ThreadManager::IsSuspendedOnEvent(JNIEnv *jni, jthread thrd)
 {
-    //JDWP_TRACE_ENTRY(LOG_RELEASE, (LOG_FUNC_FL, "IsSuspendedOnEvent(" << thrd <<
')'));
-
     MonitorAutoLock lock(m_thrdmgrMonitor JDWP_FILE_LINE);
 
     bool ret_value = false;
@@ -1043,8 +1037,6 @@
 bool
 ThreadManager::IsSuspended(jthread thrd)
 {
-    //JDWP_TRACE_ENTRY(LOG_RELEASE, (LOG_FUNC_FL, "IsSuspended(" << thrd << ')'));
-
     jint thread_state;
     jvmtiError err;
     JVMTI_TRACE(LOG_DEBUG, err, GetJvmtiEnv()->GetThreadState(thrd, &thread_state));

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/TransportManager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/TransportManager.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/TransportManager.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/TransportManager.cpp
Thu Jul 16 16:22:15 2009
@@ -75,8 +75,6 @@
         if (ret != 0) {
 	        ret = hysl_lookup_name(m_loadedLib, "jdwpTransport_UnLoad", (UDATA*) &UnloadFunc,
"VL");
         }
-	    //	reinterpret_cast<jdwpTransport_UnLoad_Type>
-        //        (GetProcAddress(m_loadedLib, unLoadDecFuncName)); 
         if ((UnloadFunc != 0) && (m_env != 0)) {
             (UnloadFunc) (&m_env); 
 		}
@@ -224,18 +222,6 @@
         return CheckReturnStatus(err);
     }
 
-    /*
-	if ((connectTimeout != 0) && isServer && (!capabilities.can_timeout_accept))
{
-        JDWP_TRACE(LOG_RELEASE, (LOG_INFO_FL, "Warning: transport does not support accept
timeout"));
-    }
-    if ((connectTimeout != 0) && (!isServer) && (!capabilities.can_timeout_attach))
{
-        JDWP_TRACE(LOG_RELEASE, (LOG_INFO_FL, "Warning: transport does not support attach
timeout"));
-    }
-    if ((handshakeTimeout != 0) && (!capabilities.can_timeout_handshake)) {
-        JDWP_TRACE(LOG_RELEASE, (LOG_INFO_FL, "Warning: transport does not support handshake
timeout"));
-    }
-	*/
-
 	// only print error message when all of handshake, accept and attach timeout can not be
used.
     if ((handshakeTimeout != 0) && (!capabilities.can_timeout_handshake) &&
(connectTimeout != 0)) {
         if ((isServer && (!capabilities.can_timeout_accept)) || ((!isServer) &&
(!capabilities.can_timeout_attach))) {
@@ -462,7 +448,6 @@
 
 LoadedLibraryHandler TransportManager::LoadTransport(const char* dirName, const char* transportName)
 {
-//    JavaVM *vm = ((internalEnv*)env->functions->reserved1)->jvm;
     PORT_ACCESS_FROM_JAVAVM(GetJavaVM());
 
     JDWP_CHECK_NULL(dirName); JDWP_CHECK_NULL(transportName);
@@ -492,13 +477,12 @@
         hystr_printf(privatePortLibrary, transportFullName, length, "%s/lib%s.so", dirName,
transportName);
     }
 #endif
-//    AgentAutoFree afv(transportFullName JDWP_FILE_LINE);
+
     UDATA res;
     UDATA ret = hysl_open_shared_library(transportFullName,&res, FALSE);
 
     if (ret != 0) {
-	JDWP_TRACE(LOG_RELEASE, (LOG_PROG_FL, "LoadTransport: loading library %s failed: %s)", transportFullName,
hyerror_last_error_message()));
-        //JDWP_TRACE(LOG_RELEASE, (LOG_PROG_FL, "LoadTransport: loading library " <<
transportFullName << " failed (error code: " << GetLastTransportError() <<
")"));
+        JDWP_TRACE(LOG_RELEASE, (LOG_PROG_FL, "LoadTransport: loading library %s failed:
%s)", transportFullName, hyerror_last_error_message()));
         res = 0;
     } else {
         JDWP_TRACE(LOG_RELEASE, (LOG_PROG_FL, "LoadTransport: transport library %s loaded",
transportFullName));

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/transport/dt_socket/SocketTransport.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/transport/dt_socket/SocketTransport.cpp?rev=794733&r1=794732&r2=794733&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/transport/dt_socket/SocketTransport.cpp
(original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/transport/dt_socket/SocketTransport.cpp
Thu Jul 16 16:22:15 2009
@@ -506,12 +506,6 @@
     if (err == 0){
 	 err = hysock_shutdown_output(envClientSocket);
     }
-
-    // it seems no necessary to check if the stream is really closed
-    // if (err != 0) {
-    //    SetLastTranError(env, "shutdown socket failed", GetLastErrorStatus(env));
-    //    return JDWPTRANSPORT_ERROR_IO_ERROR;
-    // }
     
     err = hysock_close(&envClientSocket);
     if (err != 0) {
@@ -607,7 +601,7 @@
             return JDWPTRANSPORT_ERROR_IO_ERROR;
         }
         int err = hysock_connect(clientSocket, &serverSockAddr);
-	//int err = connect(clientSocket, (struct sockaddr *)&serverSockAddr, sizeof(serverSockAddr));
+
 	if (err != 0 ) {
             SetLastTranError(env, "connection failed", GetLastErrorStatus(env));
             SetSocketBlockingMode(env, clientSocket, false);



Mime
View raw message