You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2008/03/12 04:01:23 UTC

svn commit: r636185 - in /mina/trunk/core/src/main/java/org/apache/mina/common: AbstractIoBuffer.java IoBuffer.java

Author: trustin
Date: Tue Mar 11 20:01:21 2008
New Revision: 636185

URL: http://svn.apache.org/viewvc?rev=636185&view=rev
Log:
Resolved issue: DIRMINA-529 - use isPrimitive() instead of comparing the string to a list of primitives
* Replaced hashmap lookup for primitive type names with Class.isPrimitive()


Modified:
    mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoBuffer.java
    mina/trunk/core/src/main/java/org/apache/mina/common/IoBuffer.java

Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoBuffer.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoBuffer.java?rev=636185&r1=636184&r2=636185&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoBuffer.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoBuffer.java Tue Mar 11 20:01:21 2008
@@ -1608,8 +1608,7 @@
                 @Override
                 protected void writeClassDescriptor(ObjectStreamClass desc)
                         throws IOException {
-                    String className = desc.getName();
-                    if (primitiveTypeNames.contains(className)) {
+                    if (desc.forClass().isPrimitive()) {
                         write(0);
                         super.writeClassDescriptor(desc);
                     } else {

Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoBuffer.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoBuffer.java?rev=636185&r1=636184&r2=636185&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoBuffer.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoBuffer.java Tue Mar 11 20:01:21 2008
@@ -36,7 +36,6 @@
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -306,20 +305,6 @@
         return newCapacity;
     }
     
-    protected static final Set<String> primitiveTypeNames = new HashSet<String>();
-    
-    static {
-        primitiveTypeNames.add("void");
-        primitiveTypeNames.add("boolean");
-        primitiveTypeNames.add("byte");
-        primitiveTypeNames.add("char");
-        primitiveTypeNames.add("short");
-        primitiveTypeNames.add("int");
-        primitiveTypeNames.add("long");
-        primitiveTypeNames.add("float");
-        primitiveTypeNames.add("double");
-    }
-
     /**
      * Creates a new instance.  This is an empty constructor.
      */