[hornetq-commits] JBoss hornetq SVN: r10667 - trunk/hornetq-core/src/main/java/org/hornetq/utils.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-05-16 11:30:02 -0400 (Mon, 16 May 2011)
New Revision: 10667

Modified:
   trunk/hornetq-core/src/main/java/org/hornetq/utils/TypedProperties.java
Log:
Document which are the specifications used, and revert last change.

Modified: trunk/hornetq-core/src/main/java/org/hornetq/utils/TypedProperties.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/utils/TypedProperties.java	2011-05-16 15:29:31 UTC (rev 10666)
+++ trunk/hornetq-core/src/main/java/org/hornetq/utils/TypedProperties.java	2011-05-16 15:30:02 UTC (rev 10667)
@@ -38,24 +38,27 @@
 
 /**
  * 
- * A TypedProperties
- * 
+ * Property Value Conversion.
+ * <p>
+ * This implementation follows section 3.5.4 of the <i>Java Message Service<i>
+ * specification (Version 1.1 April 12, 2002).
+ * <p>
  * TODO - should have typed property getters and do conversions herein
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- *
+ * @see <i>Java Message Service<i> specification (Version 1.1 April 12, 2002), section 3.5.4.
  */
 public class TypedProperties
 {
    private static final Logger log = Logger.getLogger(TypedProperties.class);
-   
+
    private static final SimpleString HQ_PROPNAME = new SimpleString("_HQ_");
 
    private Map<SimpleString, PropertyValue> properties;
 
    private volatile int size;
-   
+
    private boolean internalProperties;
 
    public TypedProperties()
@@ -76,7 +79,7 @@
       properties = other.properties == null ? null : new HashMap<SimpleString, PropertyValue>(other.properties);
       size = other.size;
    }
-   
+
    public boolean hasInternalProperties()
    {
       return internalProperties;
@@ -354,19 +357,17 @@
    public Float getFloatProperty(final SimpleString key) throws PropertyConversionException
    {
       Object value = doGetProperty(key);
-
+      if (value == null)
+         return Float.valueOf(null);
       if (value instanceof Float)
       {
          return ((Float)value).floatValue();
       }
-      else if (value instanceof SimpleString)
+      if (value instanceof SimpleString)
       {
          return Float.parseFloat(((SimpleString)value).toString());
       }
-      else
-      {
-         throw new PropertyConversionException("Invalid conversion: " + key);
-      }
+      throw new PropertyConversionException("Invalid conversion: " + key);
    }
 
    public SimpleString getSimpleStringProperty(final SimpleString key) throws PropertyConversionException
@@ -414,10 +415,7 @@
       {
          return new SimpleString(value.toString());
       }
-      else
-      {
-         throw new PropertyConversionException("Invalid conversion");
-      }
+      throw new PropertyConversionException("Invalid conversion");
    }
 
    public Object removeProperty(final SimpleString key)
@@ -430,10 +428,10 @@
       if (size == 0)
       {
          return false;
-         
+
       }
       else
-      {         
+      {
          return properties.containsKey(key);
       }
    }
@@ -442,7 +440,7 @@
    {
       if (size == 0)
       {
-         return Collections.EMPTY_SET;         
+         return Collections.emptySet();
       }
       else
       {
@@ -461,7 +459,7 @@
       else
       {
          int numHeaders = buffer.readInt();
-         
+
          properties = new HashMap<SimpleString, PropertyValue>(numHeaders);
          size = 0;
 
@@ -619,7 +617,7 @@
       {
          internalProperties = true;
       }
-      
+
       PropertyValue oldValue = properties.put(key, value);
       if (oldValue != null)
       {