Attachment #88131 for bug #196015

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

View | Details | Raw Unified | Return to bug 196015
Collapse All | Expand All




        m_pOwnerClass->StaticInitializerEmitted();
    }

    TResult res;
    try
    {
        res = m_instrumentor.ApplyInstrumentation();
    }
    catch (CModuleException e)
    {
    	//TODO: log an error to the log file
        res = MRTE_ERROR_FAIL;
    }
    return res;
}


Lines 390-395 Link Here

(-)src-native/src/Martini/Infrastructure/HeapAdaptor/HeapAdaptor.cpp (-1 / +10 lines)
390	*/	390	*/
391	res = InstrumentAllocSites(pJavaClass, cpObjAllocCallback, cpArrayAllocCallback,	391	res = InstrumentAllocSites(pJavaClass, cpObjAllocCallback, cpArrayAllocCallback,
392	classInfo);	392	classInfo);
		393	if (MRTE_ERROR_FAIL == res)
		394	{
		395	LOG_INFORMATIVE1("CHeapAdaptor", 0, false, "Internal error when instrumenting "
		396	"class %s. Class will not be instrumented", szClassName);
		397	}
393	}	398	}
394	else	399	else
395	{	400	{
Lines 849-857 Link Here
849	// Finalize	854	// Finalize
850	pInstIter->Free();	855	pInstIter->Free();
851	res = pMethod->ApplyInstrumentation();	856	res = pMethod->ApplyInstrumentation();
852	}	857	} // if (method information available)
853		858
854	DeallocateJavaMethodInfo(&javaMethodInfo);	859	DeallocateJavaMethodInfo(&javaMethodInfo);
		860	if (res == MRTE_ERROR_FAIL)
		861	{
		862	break;
		863	}
855	} // end of while (more methods to process)	864	} // end of while (more methods to process)
856	pMethIter->Free();	865	pMethIter->Free();
857		866

Return to bug 196015

Lines 90-96 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JavaMethod.cpp (-1 / +10 lines)
90	m_pOwnerClass->StaticInitializerEmitted();	90	m_pOwnerClass->StaticInitializerEmitted();
91	}	91	}
92		92
93	TResult res = m_instrumentor.ApplyInstrumentation();	93	TResult res;
		94	try
		95	{
		96	res = m_instrumentor.ApplyInstrumentation();
		97	}
		98	catch (CModuleException e)
		99	{
		100	//TODO: log an error to the log file
		101	res = MRTE_ERROR_FAIL;
		102	}
94	return res;	103	return res;
95	}	104	}
96		105