Attachment 48739 Details for Bug 154894 – updated patch

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

[patch] updated patch

org.eclipse.tptp.platform.models.154894.patch.txt (text/plain), 2.23 KB, created by Eugene Chan

on 2006-08-25 11:43:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Chan

Created: 2006-08-25 11:43:24 EDT

Size: 2.23 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.models
>Index: src-fastxpath-common/org/eclipse/tptp/platform/provisional/fastxpath/compiler/EclipseCompiler.java
>===================================================================
>RCS file: /home/tptp/platform/org.eclipse.tptp.platform.models/src-fastxpath-common/org/eclipse/tptp/platform/provisional/fastxpath/compiler/EclipseCompiler.java,v
>retrieving revision 1.1
>diff -u -r1.1 EclipseCompiler.java
>--- src-fastxpath-common/org/eclipse/tptp/platform/provisional/fastxpath/compiler/EclipseCompiler.java	4 May 2006 15:51:18 -0000	1.1
>+++ src-fastxpath-common/org/eclipse/tptp/platform/provisional/fastxpath/compiler/EclipseCompiler.java	25 Aug 2006 15:46:56 -0000
>@@ -51,6 +51,9 @@
> 	private char[] sourcecode;
> 
> 	private Set classLoaders;
>+	
>+	//154894 OutOfMemoryError with IBMJDK 1.5
>+	private MyClassLoader classLoader = null;
> 
> 	/**
> 	 * @see org.eclipse.tptp.platform.provisional.fastxpath.compiler.FastXPathClassGenerator#getBytes()
>@@ -63,7 +66,8 @@
> 	 * @see org.eclipse.tptp.platform.provisional.fastxpath.compiler.FastXPathClassGenerator#generateClass(byte[])
> 	 */
> 	public Class generateClass(byte[] bArr) throws ClassNotFoundException, CodeGenerationError {
>-		return new MyClassLoader(getClass().getClassLoader()).defineClass(bArr);
>+			//154894 OutOfMemoryError with IBMJDK 1.5
>+			return getClassLoader().defineClass(bArr);
> 	}
> 
> 	/**
>@@ -75,7 +79,9 @@
> 	 */
> 	public Class generateClass(final char[] source, final String targetClassName) throws ClassNotFoundException, CodeGenerationError {
> 
>-		final MyClassLoader classLoader = new MyClassLoader(getClass().getClassLoader());
>+		//154894 OutOfMemoryError with IBMJDK 1.5
>+		final MyClassLoader classLoader = getClassLoader();
>+		
> 		final ArrayList problemList = new ArrayList();
> 
> 		final INameEnvironment env = new MyNameEnvironment(targetClassName, this.getClass().getClassLoader(), source);
>@@ -364,4 +370,12 @@
> 			}
> 			return is;
> 	}
>+	
>+	//154894 OutOfMemoryError with IBMJDK 1.5
>+	protected MyClassLoader getClassLoader(){
>+		if(classLoader == null){
>+			classLoader = new MyClassLoader(getClass().getClassLoader());
>+		}
>+		return classLoader;
>+	}
> }
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 154894: 48713 | 48739