incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r777094 - /incubator/kato/trunk/org.apache.kato.tools.jdi/src/org/apache/kato/tools/jdi/DTFJReader.java
Date Thu, 21 May 2009 12:39:30 GMT
Author: spoole
Date: Thu May 21 12:39:28 2009
New Revision: 777094

URL: http://svn.apache.org/viewvc?rev=777094&view=rev
Log:
update jdi tools to support new API structure 

Modified:
    incubator/kato/trunk/org.apache.kato.tools.jdi/src/org/apache/kato/tools/jdi/DTFJReader.java

Modified: incubator/kato/trunk/org.apache.kato.tools.jdi/src/org/apache/kato/tools/jdi/DTFJReader.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.tools.jdi/src/org/apache/kato/tools/jdi/DTFJReader.java?rev=777094&r1=777093&r2=777094&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.tools.jdi/src/org/apache/kato/tools/jdi/DTFJReader.java
(original)
+++ incubator/kato/trunk/org.apache.kato.tools.jdi/src/org/apache/kato/tools/jdi/DTFJReader.java
Thu May 21 12:39:28 2009
@@ -489,7 +489,7 @@
 		logr.log(JDILogger.LEVEL_VERYVERBOSE, "Building field list..."); //$NON-NLS-1$
 		while(jClasses.hasNext()){
 			JavaClass jClass = jClasses.next();
-			Iterator jFields = jClass.getDeclaredFields();
+			Iterator jFields = jClass.getDeclaredFields().iterator();
 			while(jFields.hasNext()){
 				JavaField jField = (JavaField)jFields.next();
 				try{
@@ -519,7 +519,7 @@
 		logr.log(JDILogger.LEVEL_VERYVERBOSE, "Building method list..."); //$NON-NLS-1$
 		while(jClasses.hasNext()){
 			JavaClass jClass = jClasses.next();
-			Iterator jMethods = jClass.getDeclaredMethods();
+			Iterator jMethods = jClass.getDeclaredMethods().iterator();
 			while(jMethods.hasNext()){
 				JavaMethod jMethod = (JavaMethod)jMethods.next();
 				try{
@@ -627,23 +627,23 @@
 	private HashMap<Long, JavaClass> buildClasses() {
 		logr.log(JDILogger.LEVEL_VERYVERBOSE, "Building class list"); //$NON-NLS-1$
 		HashMap<Long, JavaClass> classes = new HashMap<Long, JavaClass>();
-		Iterator asIt = image.getAddressSpaces( );
+		Iterator asIt = image.getAddressSpaces( ).iterator();
 		while ( asIt.hasNext( ) )
 		{
 			ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-			Iterator prIt = as.getProcesses( );
+			Iterator prIt = as.getProcesses( ).iterator();
 			while ( prIt.hasNext( ) ){
 				ImageProcess process = (ImageProcess) prIt.next( );
 
-				Iterator runTimesIt = process.getRuntimes( );
+				Iterator runTimesIt = process.getRuntimes( ).iterator();
 				while ( runTimesIt.hasNext( ) )
 				{
 					JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-					Iterator classLoaders = javaRT.getJavaClassLoaders();
+					Iterator classLoaders = javaRT.getJavaClassLoaders().iterator();
 					while (classLoaders.hasNext()){
 
 						JavaClassLoader javaCL = (JavaClassLoader)classLoaders.next();
-						Iterator javaClasses = javaCL.getDefinedClasses();
+						Iterator javaClasses = javaCL.getDefinedClasses().iterator();
 
 						while (javaClasses.hasNext()){
 							JavaClass javaClass = (JavaClass)javaClasses.next();
@@ -885,27 +885,27 @@
 	 */
 	private int findLowestLineRef(long refType, long methodID) throws Exception{
 		int lowest = 1999999999;
-		Iterator asIt = image.getAddressSpaces( );
+		Iterator asIt = image.getAddressSpaces( ).iterator();
 		while ( asIt.hasNext( ) )
 		{
 			ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-			Iterator prIt = as.getProcesses( );
+			Iterator prIt = as.getProcesses( ).iterator();
 
 			while ( prIt.hasNext( ) )
 			{
 				ImageProcess process = (ImageProcess) prIt.next( );
-				Iterator runTimesIt = process.getRuntimes( );
+				Iterator runTimesIt = process.getRuntimes( ).iterator();
 				while ( runTimesIt.hasNext( ) )
 				{
 					JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-					Iterator thds = javaRT.getThreads();
+					Iterator thds = javaRT.getThreads().iterator();
 					while(thds.hasNext()){
 						Object tmpobj = thds.next();
 						if (tmpobj instanceof CorruptData){
 							//ignore this thread 
 						}else{
 							JavaThread thd = (JavaThread) tmpobj;
-							Iterator frames = thd.getStackFrames();
+							Iterator frames = thd.getStackFrames().iterator();
 							while(frames.hasNext()){
 								JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
 								JavaLocation jLocation = jStackFrame.getLocation();
@@ -943,27 +943,27 @@
 	 */
 	private int findHighestLineRef(long refType, long methodID) throws Exception{
 		int highest = 0;
-		Iterator asIt = image.getAddressSpaces( );
+		Iterator asIt = image.getAddressSpaces( ).iterator();
 		while ( asIt.hasNext( ) )
 		{
 			ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-			Iterator prIt = as.getProcesses( );
+			Iterator prIt = as.getProcesses( ).iterator();
 
 			while ( prIt.hasNext( ) )
 			{
 				ImageProcess process = (ImageProcess) prIt.next( );
-				Iterator runTimesIt = process.getRuntimes( );
+				Iterator runTimesIt = process.getRuntimes( ).iterator();
 				while ( runTimesIt.hasNext( ) )
 				{
 					JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-					Iterator thds = javaRT.getThreads();
+					Iterator thds = javaRT.getThreads().iterator();
 					while(thds.hasNext()){
 						Object tmpobj = thds.next();
 						if (tmpobj instanceof CorruptData){
 							//ignore this thread 
 						}else{
 							JavaThread thd = (JavaThread) tmpobj;
-							Iterator frames = thd.getStackFrames();
+							Iterator frames = thd.getStackFrames().iterator();
 							while(frames.hasNext()){
 								JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
 								JavaLocation jLocation = jStackFrame.getLocation();
@@ -1001,15 +1001,15 @@
 	public ReplyPacket virtualMachine(CommandPacket cpckt) throws Exception{
 		if (cpckt.getCommand() == VIRTUAL_MACHINE_VERSION){
 			logr.log(JDILogger.LEVEL_VERBOSE, "Version()"); //$NON-NLS-1$
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 				while ( prIt.hasNext( ) ){
 					ImageProcess process = (ImageProcess) prIt.next( );
 
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
@@ -1122,20 +1122,20 @@
 			return rpckt;
 		}else if (cpckt.getCommand() == VIRTUAL_MACHINE_ALL_THREADS){
 			logr.log(JDILogger.LEVEL_VERBOSE, "AllThreads()"); //$NON-NLS-1$
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 
 				while ( prIt.hasNext( ) )
 				{
 					ImageProcess process = (ImageProcess) prIt.next( );
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-						Iterator thds = javaRT.getThreads();
+						Iterator thds = javaRT.getThreads().iterator();
 						Vector<Byte> vctr = new Vector<Byte>();
 						int count = 0;
 						while(thds.hasNext()){
@@ -1319,7 +1319,7 @@
 
 			JavaClass javaClass = getClass(refType);
 			if (javaClass != null){
-				Iterator javaFields = javaClass.getDeclaredFields();
+				Iterator javaFields = javaClass.getDeclaredFields().iterator();
 				logr.log(JDILogger.LEVEL_VERYVERBOSE, javaClass.getName() + ":"); //$NON-NLS-1$
 				Vector<Byte> vctr = new Vector<Byte>();
 				int count = 0;
@@ -1353,7 +1353,7 @@
 
 			JavaClass javaClass = getClass(refType);
 			if (javaClass != null){
-				Iterator javaMethods = javaClass.getDeclaredMethods();
+				Iterator javaMethods = javaClass.getDeclaredMethods().iterator();
 				logr.log(JDILogger.LEVEL_VERYVERBOSE, javaClass.getName() + ":"); //$NON-NLS-1$
 				Vector<Byte> vctr = new Vector<Byte>();
 				int count = 0;
@@ -1404,27 +1404,27 @@
 			byte [] inData = cpckt.getByteData();
 			long refType = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "SourceFile(" + refType + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 
 				while ( prIt.hasNext( ) )
 				{
 					ImageProcess process = (ImageProcess) prIt.next( );
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-						Iterator thds = javaRT.getThreads();
+						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
 								JavaThread thd = (JavaThread) tmpobj;
-								Iterator frames = thd.getStackFrames();
+								Iterator frames = thd.getStackFrames().iterator();
 								while(frames.hasNext()){
 									JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
 									JavaLocation jLocation = jStackFrame.getLocation();
@@ -1462,7 +1462,7 @@
 
 			JavaClass javaClass = getClass(refType);
 			if (javaClass != null){
-				Iterator javaInterfaces = javaClass.getInterfaces();
+				Iterator javaInterfaces = javaClass.getInterfaces().iterator();
 				logr.log(JDILogger.LEVEL_VERYVERBOSE, javaClass.getName() + ":"); //$NON-NLS-1$
 				Vector<Byte> vctr = new Vector<Byte>();
 				int count = 0;
@@ -1555,27 +1555,27 @@
 			long refType = createLongFromBytes(inData, 0, 8);
 			long methodID = createLongFromBytes(inData, 8, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "LineTable(" + refType + "," + methodID + ")"); //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 
 				while ( prIt.hasNext( ) )
 				{
 					ImageProcess process = (ImageProcess) prIt.next( );
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-						Iterator thds = javaRT.getThreads();
+						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
 								JavaThread thd = (JavaThread) tmpobj;
-								Iterator frames = thd.getStackFrames();
+								Iterator frames = thd.getStackFrames().iterator();
 								while(frames.hasNext()){
 									JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
 									JavaLocation jLocation = jStackFrame.getLocation();
@@ -1641,27 +1641,27 @@
 			long methodID = createLongFromBytes(inData, 8, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Method.VariableTable(" + refType + "," + methodID +
")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			int slotsUsed = 0;
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 
 				while ( prIt.hasNext( ) )
 				{
 					ImageProcess process = (ImageProcess) prIt.next( );
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-						Iterator thds = javaRT.getThreads();
+						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
 								JavaThread thd = (JavaThread) tmpobj;
-								Iterator frames = thd.getStackFrames();
+								Iterator frames = thd.getStackFrames().iterator();
 								while(frames.hasNext()){
 									JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
 									JavaLocation jLocation = jStackFrame.getLocation();
@@ -1765,23 +1765,23 @@
 	 * @return
 	 */
 	private JavaObject getSlowObject(long objectID){
-		Iterator asIt = image.getAddressSpaces( );
+		Iterator asIt = image.getAddressSpaces( ).iterator();
 		while ( asIt.hasNext( ) )
 		{
 			ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-			Iterator prIt = as.getProcesses( );
+			Iterator prIt = as.getProcesses( ).iterator();
 			while ( prIt.hasNext( ) ){
 				ImageProcess process = (ImageProcess) prIt.next( );
 
-				Iterator runTimesIt = process.getRuntimes( );
+				Iterator runTimesIt = process.getRuntimes( ).iterator();
 				while ( runTimesIt.hasNext( ) )
 				{
 					JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-					Iterator heapList = javaRT.getHeaps();
+					Iterator heapList = javaRT.getHeaps().iterator();
 
 					while (heapList.hasNext()){
 						JavaHeap heap = (JavaHeap) heapList.next();
-						Iterator objectList = heap.getObjects();
+						Iterator objectList = heap.getObjects().iterator();
 						while (objectList.hasNext()){
 							JavaObject jObject = (JavaObject)objectList.next();
 							if (jObject.getID().getAddress() == objectID){
@@ -2020,20 +2020,20 @@
 			byte[] inData = cpckt.getByteData();
 			long thread = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "ThreadReference.Name(" + thread + ")"); //$NON-NLS-1$
//$NON-NLS-2$
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 
 				while ( prIt.hasNext( ) )
 				{
 					ImageProcess process = (ImageProcess) prIt.next( );
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-						Iterator thds = javaRT.getThreads();
+						Iterator thds = javaRT.getThreads().iterator();
 
 						int count = 0;
 						while(thds.hasNext()){
@@ -2069,20 +2069,20 @@
 			byte []inData = cpckt.getByteData();
 			long thread = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Status("+thread+")"); //$NON-NLS-1$ //$NON-NLS-2$
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 
 				while ( prIt.hasNext( ) )
 				{
 					ImageProcess process = (ImageProcess) prIt.next( );
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-						Iterator thds = javaRT.getThreads();
+						Iterator thds = javaRT.getThreads().iterator();
 						Vector<Byte> vctr = new Vector<Byte>();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
@@ -2182,20 +2182,20 @@
 			int length = createIntFromBytes(inData, 12, 4);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Frames(" + thread + "," + startFrame + "," + length
+ ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 
 				while ( prIt.hasNext( ) )
 				{
 					ImageProcess process = (ImageProcess) prIt.next( );
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-						Iterator thds = javaRT.getThreads();
+						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
@@ -2205,7 +2205,7 @@
 								if (thd.getObject().getID().getAddress() == thread){
 									int currentFrame = 0;
 									int count = 0;
-									Iterator frames = thd.getStackFrames();
+									Iterator frames = thd.getStackFrames().iterator();
 									Vector<Byte> vctr = new Vector<Byte>();
 									int count2 = 0;
 									while(frames.hasNext()){
@@ -2307,20 +2307,20 @@
 			long thread = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "FrameCount(" + thread + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 
 				while ( prIt.hasNext( ) )
 				{
 					ImageProcess process = (ImageProcess) prIt.next( );
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-						Iterator thds = javaRT.getThreads();
+						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
@@ -2329,7 +2329,7 @@
 								JavaThread thd = (JavaThread) tmpobj;
 								if (thd.getObject().getID().getAddress() == thread){
 									int count = 0;
-									Iterator frames = thd.getStackFrames();
+									Iterator frames = thd.getStackFrames().iterator();
 									Vector<Byte> vctr = new Vector<Byte>();
 									while(frames.hasNext()){
 										frames.next();
@@ -2616,20 +2616,20 @@
 			Vector<Byte> vctr = new Vector<Byte>();
 			ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
 			addIntToVector(vctr, 1);
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 
 				while ( prIt.hasNext( ) )
 				{
 					ImageProcess process = (ImageProcess) prIt.next( );
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-						Iterator thds = javaRT.getThreads();
+						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
@@ -2637,7 +2637,7 @@
 							}else{
 								JavaThread thd = (JavaThread) tmpobj;
 								if (thd.getObject().getID().getAddress() == threadID){
-									Iterator frames = thd.getStackFrames();
+									Iterator frames = thd.getStackFrames().iterator();
 
 									while(frames.hasNext()){
 										JavaStackFrame jFrame = (JavaStackFrame)frames.next();
@@ -2665,20 +2665,20 @@
 			//TODO - Get this to work
 			logr.log(JDILogger.LEVEL_VERBOSE, "ThisObject(" + threadID + "," + frameID + ")"); //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
 
-			Iterator asIt = image.getAddressSpaces( );
+			Iterator asIt = image.getAddressSpaces( ).iterator();
 			while ( asIt.hasNext( ) )
 			{
 				ImageAddressSpace as = (ImageAddressSpace) asIt.next( );
-				Iterator prIt = as.getProcesses( );
+				Iterator prIt = as.getProcesses( ).iterator();
 
 				while ( prIt.hasNext( ) )
 				{
 					ImageProcess process = (ImageProcess) prIt.next( );
-					Iterator runTimesIt = process.getRuntimes( );
+					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
 						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-						Iterator thds = javaRT.getThreads();
+						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
@@ -2686,7 +2686,7 @@
 							}else{
 								JavaThread thd = (JavaThread) tmpobj;
 								if (thd.getObject().getID().getAddress() == threadID){
-									Iterator frames = thd.getStackFrames();
+									Iterator frames = thd.getStackFrames().iterator();
 
 									while(frames.hasNext()){
 										JavaStackFrame jFrame = (JavaStackFrame)frames.next();



Mime
View raw message