Attachment 88131 Details for Bug 196015 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch

patch_196015.txt (text/plain), 2.28 KB, created by Asaf Yaffe

on 2008-01-29 09:45:36 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Asaf Yaffe

Created: 2008-01-29 09:45:36 EST

Size: 2.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.jvmti.runtime
>Index: src-native/src/Martini/Infrastructure/JIE/JavaMethod.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.jvmti.runtime/src-native/src/Martini/Infrastructure/JIE/JavaMethod.cpp,v
>retrieving revision 1.4
>diff -u -r1.4 JavaMethod.cpp
>--- src-native/src/Martini/Infrastructure/JIE/JavaMethod.cpp	20 Feb 2007 12:00:32 -0000	1.4
>+++ src-native/src/Martini/Infrastructure/JIE/JavaMethod.cpp	29 Jan 2008 14:41:42 -0000
>@@ -90,7 +90,16 @@
>         m_pOwnerClass->StaticInitializerEmitted();
>     }
> 
>-    TResult res = m_instrumentor.ApplyInstrumentation();
>+    TResult res;
>+    try
>+    {
>+        res = m_instrumentor.ApplyInstrumentation();
>+    }
>+    catch (CModuleException e)
>+    {
>+    	//TODO: log an error to the log file
>+        res = MRTE_ERROR_FAIL;
>+    }
>     return res;
> }
> 
>Index: src-native/src/Martini/Infrastructure/HeapAdaptor/HeapAdaptor.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.jvmti.runtime/src-native/src/Martini/Infrastructure/HeapAdaptor/HeapAdaptor.cpp,v
>retrieving revision 1.9
>diff -u -r1.9 HeapAdaptor.cpp
>--- src-native/src/Martini/Infrastructure/HeapAdaptor/HeapAdaptor.cpp	27 Jan 2008 20:56:55 -0000	1.9
>+++ src-native/src/Martini/Infrastructure/HeapAdaptor/HeapAdaptor.cpp	29 Jan 2008 14:41:42 -0000
>@@ -390,6 +390,11 @@
> */
>         res = InstrumentAllocSites(pJavaClass, cpObjAllocCallback, cpArrayAllocCallback,
>             classInfo);
>+        if (MRTE_ERROR_FAIL == res)
>+        {
>+            LOG_INFORMATIVE1("CHeapAdaptor", 0, false, "Internal error when instrumenting "
>+                "class %s. Class will not be instrumented", szClassName);
>+        }
>     }
>     else
>     {
>@@ -849,9 +854,13 @@
>             // Finalize
>             pInstIter->Free();
>             res = pMethod->ApplyInstrumentation();
>-        }
>+        } // if (method information available)
> 
>         DeallocateJavaMethodInfo(&javaMethodInfo);
>+        if (res == MRTE_ERROR_FAIL)
>+        {
>+            break;
>+        }
>     } // end of while (more methods to process)
>     pMethIter->Free();
>

Actions: View | Diff

Attachments on bug 196015: 73655 | 88131 | 88132