Attachment 60870 Details for Bug 160031 – Patch

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

[patch] Patch

org.eclipse.tptp.monitoring.la.core-v1.txt (text/plain), 2.38 KB, created by amehrega

on 2007-03-14 18:06:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: amehrega

Created: 2007-03-14 18:06:39 EDT

Size: 2.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.monitoring.la.core
>Index: cbe.import/org/eclipse/tptp/platform/common/internal/repository/TraceModelFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.monitoring.la.core/cbe.import/org/eclipse/tptp/platform/common/internal/repository/TraceModelFactoryImpl.java,v
>retrieving revision 1.1
>diff -u -r1.1 TraceModelFactoryImpl.java
>--- cbe.import/org/eclipse/tptp/platform/common/internal/repository/TraceModelFactoryImpl.java	12 Sep 2006 19:45:16 -0000	1.1
>+++ cbe.import/org/eclipse/tptp/platform/common/internal/repository/TraceModelFactoryImpl.java	14 Mar 2007 22:04:44 -0000
>@@ -20,7 +20,6 @@
> import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.ecore.resource.Resource;
>-import org.eclipse.emf.ecore.resource.Resource.Factory;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.hyades.internal.execution.local.control.Node;
> import org.eclipse.hyades.internal.execution.local.control.NodeFactory;
>@@ -39,7 +38,14 @@
> 
> import com.ibm.icu.text.DateFormat;
> 
>-public class TraceModelFactoryImpl implements ITraceModelFactory {
>+public class TraceModelFactoryImpl implements ITraceModelFactory 
>+{
>+	/**
>+	 * This static counter is used to reduce the chance of agent URIs colliding when
>+	 * multiple agents are created repeatedly
>+	 */
>+	private static int uriCounter = 0; 
>+	
> 	
> 	public TRCAgentProxy findAgent(TRCProcessProxy process, ILogFileElement logFile, IRepositoryContainer repositoryContainer) {
> 		TRCAgentProxy agent = null;
>@@ -110,9 +116,18 @@
> 			tempURI = tempURI.appendSegment(segments[x]);
> 		}
> 		String pPath = tempURI.appendSegment(fileName).toString();
>+		
>+		/* Ali M.: defect 160031 - a static counter is used to reduce the chance of
>+		 * URI colliding */
>+		if (uriCounter >= Integer.MAX_VALUE)
>+			uriCounter = 0;
>+		int counterInx = pPath.lastIndexOf('_');
>+		counterInx = counterInx < 0 ? pPath.lastIndexOf('.') : counterInx;
>+		counterInx = counterInx < 0 ? pPath.length() : counterInx;
>+		pPath = pPath.substring(0, counterInx) + uriCounter++ + pPath.substring(counterInx);
> 
> 		URI uri = URI.createURI(pPath);
>-
>+		
> 		Resource agDoc = Resource.Factory.Registry.INSTANCE.getFactory(uri)
> 				.createResource(uri);
> 		agDoc.setModified(true);

Actions: View | Diff

Attachments on bug 160031: 51549 | 51550 | 60870