harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r588616 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp
Date Fri, 26 Oct 2007 12:02:12 GMT
Author: varlax
Date: Fri Oct 26 05:02:11 2007
New Revision: 588616

URL: http://svn.apache.org/viewvc?rev=588616&view=rev
Log:
Applied HARMONY-5030 [drlvm][finalizer] Regression in gc.RunFinalizersOnExit on all configurations.

Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp?rev=588616&r1=588615&r2=588616&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp Fri Oct 26 05:02:11 2007
@@ -112,7 +112,6 @@
     bool is_class_ignored(Class* test);
     bool classes_cached;
     Lock_Manager ignore_lock;
-    Class* CharsetEncoder;
     Class* FileDescriptor;
     Class* FileOutputStream;
 
@@ -278,7 +277,7 @@
     }
 } //Objects_To_Finalize::add_object
 
-// workaround method to ignore classes java.nio.charset.CharsetEncoder
+// workaround method to ignore classes
 // java.io.FileDescriptor & java.io.FileOutputStream during finalization on exit
 bool Objects_To_Finalize::is_class_ignored(Class* test) {
     assert(!hythread_is_suspend_enabled());
@@ -287,16 +286,11 @@
     
         tmn_suspend_enable();
         
-        String* CharsetEncoderName =
-                VM_Global_State::loader_env->string_pool.lookup("com/ibm/icu4jni/charset/CharsetEncoderICU");
         String* FileDescriptorName =
                 VM_Global_State::loader_env->string_pool.lookup("java/io/FileDescriptor");
         String* FileOutputStreamName =
                 VM_Global_State::loader_env->string_pool.lookup("java/io/FileOutputStream");
         
-        Class* CharsetEncoder = 
-            VM_Global_State::loader_env->bootstrap_class_loader->LoadVerifyAndPrepareClass(
-                VM_Global_State::loader_env, CharsetEncoderName);
         Class* FileDescriptor = 
             VM_Global_State::loader_env->bootstrap_class_loader->LoadVerifyAndPrepareClass(
                 VM_Global_State::loader_env, FileDescriptorName);
@@ -306,15 +300,12 @@
         
         tmn_suspend_disable();
         ignore_lock._lock();
-        this->CharsetEncoder = CharsetEncoder;
         this->FileDescriptor = FileDescriptor;
         this->FileOutputStream = FileOutputStream;
         classes_cached = true;
         ignore_lock._unlock();
     }
-    return ((test==CharsetEncoder) 
-            || (test==FileDescriptor) 
-            || (test==FileOutputStream));
+    return ((test==FileDescriptor) || (test==FileOutputStream));
 }
 
 void Objects_To_Finalize::check_fields_obtained() {



Mime
View raw message