harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r926513 - in /harmony/enhanced/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/make/ classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic/ classlib/modules/concurrent/src/main/java/java/util/concurrent/locks/ c...
Date Tue, 23 Mar 2010 09:54:48 GMT
Author: hindessm
Date: Tue Mar 23 09:54:46 2010
New Revision: 926513

URL: http://svn.apache.org/viewvc?rev=926513&view=rev
Log:
Merging changes from trunk@926505 to java6 branch.

Modified:
    harmony/enhanced/branches/java6/   (props changed)
    harmony/enhanced/branches/java6/classlib/   (props changed)
    harmony/enhanced/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/branches/java6/classlib/make/depends-common.xml   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic/
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks/
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/jmx/META-INF/   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/fdlibm.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/gp.h   (props
changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hymagic.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hysocket.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hyvmls.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jni.h  
(props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmpi.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmri.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmti.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/vmi.h  
(props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/
  (props changed)
    harmony/enhanced/branches/java6/common_resources/   (props changed)
    harmony/enhanced/branches/java6/drlvm/   (props changed)
    harmony/enhanced/branches/java6/drlvm/make/tests/jvmti-test.xml
    harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/em64t/native_unwind_arch.cpp
    harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/linux/stack_dump_os.cpp
    harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/native_unwind.cpp
    harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/stack_dump.cpp
    harmony/enhanced/branches/java6/drlvm/vm/port/src/modules/native_modules.c
    harmony/enhanced/branches/java6/drlvm/vm/tests/unit/thread/test_stress_suspend.h
    harmony/enhanced/branches/java6/drlvm/vm/vmcore/src/util/crash_dump.cpp
    harmony/enhanced/branches/java6/jdktools/   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.classpath   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.project   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF   (props
changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/build.xml   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
  (props changed)

Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1 +1 @@
-/harmony/enhanced/trunk:810871-926319
+/harmony/enhanced/trunk:810871-926505

Propchange: harmony/enhanced/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
-/harmony/enhanced/trunk/classlib:926318-926319
+/harmony/enhanced/trunk/classlib:926318-926505
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Propchange: harmony/enhanced/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/trunk/classlib/depends/libs:926318-926319
+/harmony/enhanced/trunk/classlib/depends/libs:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-926091
-/harmony/enhanced/trunk/classlib/make/depends-common.xml:926318-926319
+/harmony/enhanced/trunk/classlib/make/depends-common.xml:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-926091
-/harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic:926318-926319
+/harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-926091
-/harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks:926318-926319
+/harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/jmx/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-926091
-/harmony/enhanced/trunk/classlib/modules/jmx/META-INF:926318-926319
+/harmony/enhanced/trunk/classlib/modules/jmx/META-INF:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/fdlibm.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/fdlibm.h:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/fdlibm.h:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/gp.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/gp.h:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/gp.h:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hymagic.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hymagic.h:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hymagic.h:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hysocket.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hysocket.h:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hysocket.h:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hyvmls.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hyvmls.h:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hyvmls.h:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jni.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jni.h:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jni.h:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmpi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmpi.h:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmpi.h:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmri.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmri.h:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmri.h:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmti.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmti.h:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmti.h:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/vmi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/vmi.h:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/vmi.h:926318-926505

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources:926318-926319
+/harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources:926318-926505

Propchange: harmony/enhanced/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/trunk/common_resources:476396-920147,921783-926319
+/harmony/enhanced/trunk/common_resources:476396-920147,921783-926505
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Propchange: harmony/enhanced/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/trunk/drlvm:810871-926319
+/harmony/enhanced/trunk/drlvm:810871-926505
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Modified: harmony/enhanced/branches/java6/drlvm/make/tests/jvmti-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/drlvm/make/tests/jvmti-test.xml?rev=926513&r1=926512&r2=926513&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/drlvm/make/tests/jvmti-test.xml (original)
+++ harmony/enhanced/branches/java6/drlvm/make/tests/jvmti-test.xml Tue Mar 23 09:54:46 2010
@@ -40,7 +40,9 @@
     </pathconvert>
 
     <target name="compile-jvmti-tests-java">
-        <compile-java dest="${jvmti.test.class.path}" src="${jvmti.test.src}"/>
+        <compile-java dest="${jvmti.test.class.path}" src="${jvmti.test.src}">
+            <classpath location="${junit.jar}" />
+        </compile-java>
     </target>
 
     <target name="compile-jvmti-tests-native">

Modified: harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/em64t/native_unwind_arch.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/em64t/native_unwind_arch.cpp?rev=926513&r1=926512&r2=926513&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/em64t/native_unwind_arch.cpp
(original)
+++ harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/em64t/native_unwind_arch.cpp
Tue Mar 23 09:54:46 2010
@@ -47,7 +47,7 @@ static bool native_check_caller(UnwindCo
 {
     void* target = NULL;
     char* ptr = (char*)*sp;
-    
+
     if (native_dec_instr(context, ptr - 2, &target) == 2 || // CALL r/m64 w/o SIB w/o
disp
         native_dec_instr(context, ptr - 3, &target) == 3 || // CALL r/m64 w/ SIB w/o
disp
         native_dec_instr(context, ptr - 4, &target) == 4 || // CALL r/m64 w/ SIB w/ disp8

Modified: harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/linux/stack_dump_os.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/linux/stack_dump_os.cpp?rev=926513&r1=926512&r2=926513&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/linux/stack_dump_os.cpp
(original)
+++ harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/linux/stack_dump_os.cpp
Tue Mar 23 09:54:46 2010
@@ -56,8 +56,8 @@ static inline native_segment_t* sd_find_
 
 void sd_get_c_method_info(CFunInfo* info, native_module_t* module, void* ip)
 {
-    *info->name = 0;
-    *info->filename = 0;
+    *info->name = '\0';
+    *info->filename = '\0';
     info->line = -1;
 
     if (!module || !module->filename)
@@ -183,16 +183,24 @@ void sd_init_crash_handler()
 
 void sd_cleanup_crash_handler()
 {
-    STD_FREE(g_curdir);
-    STD_FREE(g_cmdline);
+    if (g_curdir)
+        STD_FREE(g_curdir);
+    if (g_cmdline)
+        STD_FREE(g_cmdline);
 }
 
 void sd_print_cmdline_cwd()
 {
     fprintf(stderr, "\nCommand line:\n");
-    for (const char* ptr = g_cmdline; *ptr; ptr += strlen(ptr) + 1)
-        fprintf(stderr, "%s ", ptr);
-    fprintf(stderr, "\n");
+
+    if (g_cmdline)
+    {
+        for (const char* ptr = g_cmdline; *ptr; ptr += strlen(ptr) + 1)
+            fprintf(stderr, "%s ", ptr);
+        fprintf(stderr, "\n");
+    }
+    else
+        fprintf(stderr, "is unavailable, probably /proc is not mounted\n");
 
     fprintf(stderr, "\nWorking directory:\n%s\n", g_curdir ? g_curdir : "'null'");
 }

Modified: harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/native_unwind.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/native_unwind.cpp?rev=926513&r1=926512&r2=926513&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/native_unwind.cpp (original)
+++ harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/native_unwind.cpp Tue
Mar 23 09:54:46 2010
@@ -44,6 +44,9 @@ bool port_init_unwind_context(UnwindCont
     if (!context)
         return false;
 
+    context->clean_modules = false;
+    context->modules = NULL;
+
     if (!modules)
     {
         int mod_count;
@@ -56,15 +59,13 @@ bool port_init_unwind_context(UnwindCont
         context->modules = mod_list;
     }
     else
-    {
-        context->clean_modules = false;
         context->modules = modules;
-    }
 
     if (!native_get_stack_range(context, regs, &context->stack))
     {
         if (context->clean_modules)
             port_clear_modules(&context->modules);
+        context->clean_modules = false;
         return false;
     }
 

Modified: harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/stack_dump.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/stack_dump.cpp?rev=926513&r1=926512&r2=926513&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/stack_dump.cpp (original)
+++ harmony/enhanced/branches/java6/drlvm/vm/port/src/crash_handler/stack_dump.cpp Tue Mar
23 09:54:46 2010
@@ -40,7 +40,7 @@ static void sd_fill_modules()
 
     int count;
     bool res = port_get_all_modules(&g_modules, &count);
-    assert(res && g_modules && count);
+    assert((res && count) || !g_modules);
 }
 
 
@@ -104,8 +104,12 @@ static void sd_print_vm_line(FILE* file,
 
 static void sd_print_c_line(FILE* file, int count, Registers* regs, CFunInfo* cfi)
 {
-    if (!cfi->name)
+    if (!*cfi->name)
+    {
+        fprintf(file, "%3d: 0x%"W_PI_FMT"  <unknown>\n",
+                count, regs->get_ip());
         return;
+    }
 
     fprintf(file, "%3d: 0x%"W_PI_FMT"  %s (%s:%d)\n",
         count, regs->get_ip(), cfi->name,

Modified: harmony/enhanced/branches/java6/drlvm/vm/port/src/modules/native_modules.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/drlvm/vm/port/src/modules/native_modules.c?rev=926513&r1=926512&r2=926513&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/drlvm/vm/port/src/modules/native_modules.c (original)
+++ harmony/enhanced/branches/java6/drlvm/vm/port/src/modules/native_modules.c Tue Mar 23
09:54:46 2010
@@ -47,6 +47,12 @@ void port_dump_modules(native_module_t* 
     native_module_t* module;
     size_t i;
 
+    if (!modules)
+    {
+        fprintf(out, "unavailable, probably /proc is not mounted\n");
+        return;
+    }
+
     for (module = modules; module; module = module->next)
     {
         if (!module->filename)

Modified: harmony/enhanced/branches/java6/drlvm/vm/tests/unit/thread/test_stress_suspend.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/drlvm/vm/tests/unit/thread/test_stress_suspend.h?rev=926513&r1=926512&r2=926513&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/drlvm/vm/tests/unit/thread/test_stress_suspend.h (original)
+++ harmony/enhanced/branches/java6/drlvm/vm/tests/unit/thread/test_stress_suspend.h Tue Mar
23 09:54:46 2010
@@ -16,7 +16,9 @@
 */
 
 #include <stdio.h>
+#ifdef _WIN32
 #include <malloc.h>
+#endif
 #include <open/hythread_ext.h>
 #include <apr_atomic.h>
 #include <open/types.h>

Modified: harmony/enhanced/branches/java6/drlvm/vm/vmcore/src/util/crash_dump.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/drlvm/vm/vmcore/src/util/crash_dump.cpp?rev=926513&r1=926512&r2=926513&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/drlvm/vm/vmcore/src/util/crash_dump.cpp (original)
+++ harmony/enhanced/branches/java6/drlvm/vm/vmcore/src/util/crash_dump.cpp Tue Mar 23 09:54:46
2010
@@ -450,7 +450,7 @@ static void cd_fill_modules()
 
     int count;
     bool res = port_get_all_modules(&g_modules, &count);
-    assert(res && g_modules && count);
+    assert((res && count) || !g_modules);
 }
 
 static void cd_print_module_info(Registers* regs)

Propchange: harmony/enhanced/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/jdktools/trunk:630107-925933
-/harmony/enhanced/trunk/jdktools:926309-926319
+/harmony/enhanced/trunk/jdktools:926309-926505
 /harmony/enhanced/trunk/working_jdktools:476396-920147
 /incubator/harmony/enhanced/trunk/working_jdktools:423974-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.classpath
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.project
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.project:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.project:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/.project:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.project:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 09:54:46 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:926309-926319
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:926309-926505
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:467609-476394



Mime
View raw message