[vmkit-commits] [vmkit] r180533 - Fixed OpenJDK implementation

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:20:59 2013
New Revision: 180533

URL: http://llvm.org/viewvc/llvm-project?rev=180533&view=rev
Log:
Fixed OpenJDK implementation
(cherry picked from commit 387c8ffc9b290e039add084275ccff01b6d1d167)

Modified:
    vmkit/trunk/lib/j3/VMCore/JavaObject.cpp

Modified: vmkit/trunk/lib/j3/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaObject.cpp?rev=180533&r1=180532&r2=180533&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaObject.cpp Thu Apr 25 12:20:59 2013
@@ -21,6 +21,8 @@
 #include "Jnjvm.h"
 #include "VMStaticInstance.h"
 
+#include "Classpath.h"
+
 #include "j3/jni.h"
 #include "debug.h"
 
@@ -421,7 +423,9 @@ std::ostream& j3::operator << (std::ostr
 			char *threadName = JavaString::strToAsciiz(threadNameObj);
 			os << ",name=\"" << threadName << '\"';
 			delete [] threadName;
-		} else if (ccl == vm->upcalls->newVMThread) {
+		}
+#ifndef	 OpenJDKPath
+		else if (ccl == vm->upcalls->newVMThread) {
 			const JavaObjectVMThread& vmthObj = (const JavaObjectVMThread&)obj;
 			for (int retries = 10; (!vmthObj.vmdata) && (retries >= 0); --retries)
 				usleep(100);
@@ -429,6 +433,7 @@ std::ostream& j3::operator << (std::ostr
 			if (const JavaObject* thObj = vmthObj.vmdata->currentThread())
 				os << ",thread=" << *thObj;
 		}
+#endif
 
 		os << ')';
 	}