You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2006/11/22 19:10:10 UTC
svn commit: r478267 - in /harmony/enhanced/drlvm/trunk: build/make/excludes/
vm/vmcore/src/kernel_classes/javasrc/java/lang/
Author: gshimansky
Date: Wed Nov 22 10:10:09 2006
New Revision: 478267
URL: http://svn.apache.org/viewvc?view=rev&rev=478267
Log:
Applied HARMONY-2268 [DRLVM] Fixing again reverted change in Runtime.java in kernel classes
Tested on winXP, w2k3 and ubuntu. Test successfully unmasked
Modified:
harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.int
harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.jet
harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt
harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/java/lang/Runtime.java
Modified: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.int
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.int?view=diff&rev=478267&r1=478266&r2=478267
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.int (original)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.int Wed Nov 22 10:10:09 2006
@@ -9,6 +9,5 @@
java/lang/RuntimeAdditionalTest41.java
java/lang/RuntimeAdditionalTest42.java
-java/lang/SystemExtensionTest.java
java/lang/ObjectTest.java
Modified: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.jet
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.jet?view=diff&rev=478267&r1=478266&r2=478267
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.jet (original)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.jet Wed Nov 22 10:10:09 2006
@@ -9,6 +9,5 @@
java/lang/RuntimeAdditionalTest41.java
java/lang/RuntimeAdditionalTest42.java
-java/lang/SystemExtensionTest.java
java/lang/ObjectTest.java
Modified: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt?view=diff&rev=478267&r1=478266&r2=478267
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt (original)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt Wed Nov 22 10:10:09 2006
@@ -9,6 +9,5 @@
java/lang/RuntimeAdditionalTest41.java
java/lang/RuntimeAdditionalTest42.java
-java/lang/SystemExtensionTest.java
java/lang/ObjectTest.java
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/java/lang/Runtime.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/java/lang/Runtime.java?view=diff&rev=478267&r1=478266&r2=478267
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/java/lang/Runtime.java (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/java/lang/Runtime.java Wed Nov 22 10:10:09 2006
@@ -151,11 +151,13 @@
private final native void close0(long handle) throws IOException;
public final synchronized void close() throws IOException {
+ if (streamHandle == -1) return;
close0(streamHandle);
+ streamHandle = -1;
}
protected void finalize() throws Throwable {
- close0(streamHandle);
+ close();
}
}
@@ -238,11 +240,13 @@
private final native void close0(long handle);
public final synchronized void close() throws IOException {
+ if (streamHandle == -1) return;
close0(streamHandle);
+ streamHandle = -1;
}
protected void finalize() throws Throwable {
- close0(streamHandle);
+ close();
}
}