harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r807351 - in /harmony/enhanced/classlib/branches/java6: ./ make/ modules/concurrent/src/main/java/java/util/concurrent/atomic/ modules/concurrent/src/main/java/java/util/concurrent/locks/ modules/jmx/META-INF/ modules/lang-management/src/te...
Date Mon, 24 Aug 2009 19:43:09 GMT
Author: hindessm
Date: Mon Aug 24 19:43:07 2009
New Revision: 807351

URL: http://svn.apache.org/viewvc?rev=807351&view=rev
Log:
Merge updates from classlib trunk@807222 since r805827.

Modified:
    harmony/enhanced/classlib/branches/java6/   (props changed)
    harmony/enhanced/classlib/branches/java6/make/depends-common.xml   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.zos.s390.ibm
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.zos.s390x.ibm
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h   (props
changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h  
(props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h  
(props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/dblparse.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/fltparse.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/  
(props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
  (props changed)

Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-805827
+/harmony/enhanced/classlib/trunk:713674-735919,765923-807222

Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-805827
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-805827
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-805827
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-805827
+/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-805827
+/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-807222

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.zos.s390.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.zos.s390.ibm?rev=807351&r1=807350&r2=807351&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.zos.s390.ibm (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.zos.s390.ibm Mon Aug
24 19:43:07 2009
@@ -2,5 +2,3 @@
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
 org/apache/harmony/luni/tests/java/lang/PackageTest.java
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java
-org/apache/harmony/luni/tests/java/lang/DoubleTest.java
-org/apache/harmony/luni/tests/java/lang/FloatTest.java

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.zos.s390x.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.zos.s390x.ibm?rev=807351&r1=807350&r2=807351&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.zos.s390x.ibm (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.zos.s390x.ibm Mon Aug
24 19:43:07 2009
@@ -2,5 +2,3 @@
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
 org/apache/harmony/luni/tests/java/lang/PackageTest.java
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java
-org/apache/harmony/luni/tests/java/lang/DoubleTest.java
-org/apache/harmony/luni/tests/java/lang/FloatTest.java

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java?rev=807351&r1=807350&r2=807351&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java
Mon Aug 24 19:43:07 2009
@@ -17,15 +17,12 @@
 
 package java.util;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 import java.io.Serializable;
 import java.security.AccessController;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 
 import org.apache.harmony.luni.util.PriviAction;
 
@@ -44,8 +41,6 @@
 
     private static final long serialVersionUID = 9149081749638150636L;
 
-    private static volatile Locale[] availableLocales;
-
     // Initialize a default which is used during static
     // initialization of the default for the platform.
     private static Locale defaultLocale = new Locale();
@@ -296,91 +291,6 @@
         return false;
     }
 
-    static Locale[] find(String prefix) {
-        int last = prefix.lastIndexOf('/');
-        final String thePackage = prefix.substring(0, last + 1);
-        int length = prefix.length();
-        final String classPrefix = prefix.substring(last + 1, length);
-        Set<String> result = new HashSet<String>();
-        StringTokenizer paths = new StringTokenizer(System.getProperty(
-                "org.apache.harmony.boot.class.path", ""), System.getProperty( //$NON-NLS-1$
//$NON-NLS-2$
-                "path.separator", ";")); //$NON-NLS-1$//$NON-NLS-2$
-        while (paths.hasMoreTokens()) {
-            String nextToken = paths.nextToken();
-            File directory = new File(nextToken);
-            if (directory.exists()) {
-                if (directory.isDirectory()) {
-                    String path;
-                    try {
-                        path = directory.getCanonicalPath();
-                    } catch (IOException e) {
-                        continue;
-                    }
-                    File newDir;
-                    if (path.charAt(path.length() - 1) == File.separatorChar) {
-                        newDir = new File(path + thePackage);
-                    } else {
-                        newDir = new File(path + File.separatorChar
-                                + thePackage);
-                    }
-                    if (newDir.isDirectory()) {
-                        String[] list = newDir.list();
-                        for (int i = 0; i < list.length; i++) {
-                            String name = list[i];
-                            if (name.startsWith(classPrefix)
-                                    && name.endsWith(".class")) { //$NON-NLS-1$
-                                result
-                                        .add(name.substring(0,
-                                                name.length() - 6));
-                            }
-                        }
-                    }
-
-                } else {
-                    // Handle ZIP/JAR files.
-                    try {
-                        ZipFile zip = new ZipFile(directory);
-                        Enumeration<? extends ZipEntry> entries = zip.entries();
-                        while (entries.hasMoreElements()) {
-                            ZipEntry e = entries.nextElement();
-                            String name = e.getName();
-                            if (name.startsWith(prefix)
-                                    && name.endsWith(".class")) {//$NON-NLS-1$
-                                result.add(name.substring(last + 1, name
-                                        .length() - 6));
-                            }
-                        }
-                        zip.close();
-                    } catch (IOException e) {
-                        // Empty
-                    }
-                }
-            }
-        }
-        Locale[] locales = new Locale[result.size()];
-        int i = 0;
-        for (String name : result) {
-            int index = name.indexOf('_');
-            int nextIndex = name.indexOf('_', index + 1);
-            if (nextIndex == -1) {
-                locales[i++] = new Locale(name.substring(index + 1, name
-                        .length()), ""); //$NON-NLS-1$
-            } else {
-                String language = name.substring(index + 1, nextIndex);
-                String variant;
-                if ((index = name.indexOf('_', nextIndex + 1)) == -1) {
-                    variant = ""; //$NON-NLS-1$
-                    index = name.length();
-                } else {
-                    variant = name.substring(index + 1, name.length());
-                }
-                String country = name.substring(nextIndex + 1, index);
-                locales[i++] = new Locale(language, country, variant);
-            }
-        }
-        return locales;
-    }
-
 	/**
      * Gets the list of installed {@code Locale}. At least a {@code Locale} that is equal
to
      * {@code Locale.US} must be contained in this array.

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-807222

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/dblparse.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/dblparse.c?rev=807351&r1=807350&r2=807351&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/dblparse.c
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/dblparse.c
Mon Aug 24 19:43:07 2009
@@ -293,7 +293,7 @@
     }
   else if (e >= 0 && e < APPROX_MAX_MAGNITUDE)
     {
-      result = toDoubleHighPrecision (f, length) * pow (10.0, e);
+      result = toDoubleHighPrecision (f, length) * pow (10.0, (double) e);
     }
   else if (e >= APPROX_MAX_MAGNITUDE)
     {
@@ -313,14 +313,14 @@
     }
   else if (e > APPROX_MIN_MAGNITUDE)
     {
-      result = toDoubleHighPrecision (f, length) / pow (10.0, -e);
+      result = toDoubleHighPrecision (f, length) / pow (10.0, (double) -e);
     }
 
   if (e <= APPROX_MIN_MAGNITUDE)
     {
 
-      result = toDoubleHighPrecision (f, length) * pow (10.0, e + 52);
-      result = result * pow (10.0, -52);
+      result = toDoubleHighPrecision (f, length) * pow (10.0, (double) (e + 52));
+      result = result * pow (10.0, (double) -52);
 
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/fltparse.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/fltparse.c?rev=807351&r1=807350&r2=807351&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/fltparse.c
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/fltparse.c
Mon Aug 24 19:43:07 2009
@@ -231,7 +231,7 @@
     }
   else if (e >= 0 && e < 39)
     {
-      result = (jfloat) (toDoubleHighPrecision (f, length) * pow (10.0, e));
+      result = (jfloat) (toDoubleHighPrecision (f, length) * pow (10.0, (double) e));
     }
   else if (e >= 39)
     {
@@ -251,7 +251,7 @@
       int dexp;
       U_32 fmant, fovfl;
       U_64 dmant;
-      dresult = toDoubleHighPrecision (f, length) / pow (10.0, -e);
+      dresult = toDoubleHighPrecision (f, length) / pow (10.0, (double) -e);
       if (IS_DENORMAL_DBL (dresult))
         {
           FLOAT_TO_INTBITS (result) = 0;

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-805827
+/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-807222

Modified: harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java?rev=807351&r1=807350&r2=807351&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java
Mon Aug 24 19:43:07 2009
@@ -483,7 +483,7 @@
             }
         } catch (IOException ex) {
             // Unexpected ClassLoader exception, ignore
-		} finally {
+        } finally {
 		    inForNameInternal = false;
         }
         return null;
@@ -494,7 +494,7 @@
      */
     private static void cacheCharset(Charset cs) {
         if (!cachedCharsetTable.containsKey(cs.name())){
-            cachedCharsetTable.put(cs.name(), cs);  
+            cachedCharsetTable.put(cs.name(), cs);
         }
         Set<String> aliasesSet = cs.aliases();
         if (null != aliasesSet) {
@@ -502,7 +502,7 @@
             while (iter.hasNext()) {
                 String alias = iter.next();
                 if (!cachedCharsetTable.containsKey(alias)) {
-                    cachedCharsetTable.put(alias, cs); 
+                    cachedCharsetTable.put(alias, cs);
                 }
             }
         }
@@ -536,8 +536,8 @@
      * @throws IllegalCharsetNameException
      *             if the specified charset name is illegal.
      */
-    public static boolean isSupported(String charsetName) {
-        if (inForNameInternal  == true) {
+    public static synchronized boolean isSupported(String charsetName) {
+        if (inForNameInternal) {
             Charset cs = cachedCharsetTable.get(charsetName);
             if (null != cs) {
                 return true;

Modified: harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java?rev=807351&r1=807350&r2=807351&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java
Mon Aug 24 19:43:07 2009
@@ -339,12 +339,12 @@
                 continue;
             }
             checkCoderResult(result);
-        output.flip();
-        if (result.isMalformed()) {
-            throw new MalformedInputException(result.length());
-        } else if (result.isUnmappable()) {
-            throw new UnmappableCharacterException(result.length());
-        }
+            output.flip();
+            if (result.isMalformed()) {
+                throw new MalformedInputException(result.length());
+            } else if (result.isUnmappable()) {
+                throw new UnmappableCharacterException(result.length());
+            }
             break;
         }
         status = FLUSH;
@@ -451,18 +451,18 @@
             } catch (BufferUnderflowException e) {
                 throw new CoderMalfunctionError(e);
             }
-            if (result==CoderResult.UNDERFLOW) {
+            if (result == CoderResult.UNDERFLOW) {
                 status = endOfInput ? END : ONGOING;
                 if (endOfInput) {
                     int remaining = in.remaining();
-                    if( remaining > 0) {
-                    result = CoderResult.malformedForLength(remaining);
+                    if (remaining > 0) {
+                        result = CoderResult.malformedForLength(remaining);
+                    } else {
+                        return result;
+                    }
                 } else {
                     return result;
                 }
-                } else {
-                    return result;
-            }
             } else if (result==CoderResult.OVERFLOW) {
                 status = endOfInput ? END : ONGOING;
                 return result;

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-805827
+/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-805827
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-805827
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-807222

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.windows.x86.drl?rev=807351&r1=807350&r2=807351&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.windows.x86.drl Mon
Aug 24 19:43:07 2009
@@ -1,4 +1,9 @@
-javax/swing/JFileChooserRTest
+javax/swing/JFileChooserTest.java
+javax/swing/JFileChooserRTest.java
+javax/swing/plaf/basic/BasicFileChooserUITest.java
+javax/swing/plaf/basic/BasicListUITest.java
+javax/swing/plaf/metal/MetalFileChooserUITest.java
+
 javax/swing/Timer_MultithreadedTest.java
 javax/swing/text/AbstractDocument_AbstractElement_MASNoLockTest.java
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-805827
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-805827
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-807222

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:43:07 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-805827
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-807222



Mime
View raw message