[vmkit-commits] [vmkit] r180539 - Returning correct error information if Incinerator's VM interface is accessed when J3 was not built to support Incinerator.

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:21:26 2013
New Revision: 180539

URL: http://llvm.org/viewvc/llvm-project?rev=180539&view=rev
Log:
Returning correct error information if Incinerator's VM interface is accessed when J3 was not built to support Incinerator.
Updated git clone URL.
(cherry picked from commit 4cb2f5b152487ab26394beb7d83a4f25c2962c0c)

Modified:
    vmkit/trunk/README.TXT
    vmkit/trunk/lib/j3/VMCore/JnjvmIntOSGi.cpp

Modified: vmkit/trunk/README.TXT
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/README.TXT?rev=180539&r1=180538&r2=180539&view=diff
==============================================================================
--- vmkit/trunk/README.TXT (original)
+++ vmkit/trunk/README.TXT Thu Apr 25 12:21:26 2013
@@ -101,7 +101,7 @@ git clone git://scm.gforge.inria.fr/vmki
 
 * or get as an official developer (Git):
 
-git clone git+ssh://YOUR_USER_NAME@gforge.inria.fr//gitroot/vmkit2/vmkit2.git
+git clone git+ssh://YOUR_USER_NAME@scm.gforge.inria.fr//gitroot/vmkit2/vmkit2.git
 
 * Make it (release mode):
 

Modified: vmkit/trunk/lib/j3/VMCore/JnjvmIntOSGi.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JnjvmIntOSGi.cpp?rev=180539&r1=180538&r2=180539&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JnjvmIntOSGi.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JnjvmIntOSGi.cpp Thu Apr 25 12:21:26 2013
@@ -202,6 +202,8 @@ extern "C" ArrayLong* Java_j3_vm_OSGi_ge
 	Jnjvm* vm = JavaThread::get()->getJVM();
 	return vm->getReferencesToObject(reinterpret_cast<const JavaObject*>((intptr_t)objectPointer));
 
+#else
+	return NULL;
 #endif
 }
 
@@ -216,6 +218,8 @@ extern "C" JavaString* Java_j3_vm_OSGi_d
 
 	Jnjvm* vm = JavaThread::get()->getJVM();
 	return vm->asciizToStr(ss.str().c_str());
-
+	
+#else
+	return NULL;
 #endif
 }