TUSCANY-3099 log an error if an invalid header priority is entered

TUSCANY-3098 don't throw an NPE is a property doesn't have a name

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@788735 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 21 insertions, 11 deletions

diff --git a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
index 3d0a2d8bf9..2ed1dcf48b 100644
--- a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
+++ b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
@@ -565,11 +565,15 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St
 
         String jmsPriority = reader.getAttributeValue(null, "JMSPriority");
         if (jmsPriority != null && jmsPriority.length() > 0) {
-            int p = Integer.parseInt(jmsPriority);
-            if (p >= 0 && p <= 9) {
-                jmsBinding.setJMSPriority(p);
-            } else {
-                warning("InvalidJMSPriority", jmsBinding, jmsPriority);
+            try {
+                int p = Integer.parseInt(jmsPriority);
+                if (p >= 0 && p <= 9) {
+                    jmsBinding.setJMSPriority(p);
+                } else {
+                    warning("InvalidJMSPriority", jmsBinding, jmsPriority);
+                }
+            } catch (NumberFormatException ex) {
+                error("InvalidJMSPriority", jmsBinding, jmsPriority);
             }
         }
 
@@ -702,11 +706,15 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St
 
         String jmsPriority = reader.getAttributeValue(null, "JMSPriority");
         if (jmsPriority != null && jmsPriority.length() > 0) {
-            int p = Integer.parseInt(jmsPriority);
-            if (p >= 0 && p <= 9) {
-                jmsBinding.setOperationJMSPriority(opName, p);
-            } else {
-                warning("InvalidOPJMSPriority", jmsBinding, jmsPriority);
+            try {
+                int p = Integer.parseInt(jmsPriority);
+                if (p >= 0 && p <= 9) {
+                    jmsBinding.setOperationJMSPriority(opName, p);
+                } else {
+                    warning("InvalidOPJMSPriority", jmsBinding, jmsPriority);
+                }
+            } catch (NumberFormatException ex) {
+                error("InvalidOPJMSPriority", jmsBinding, jmsPriority);
             }
         }
 
@@ -1195,7 +1203,9 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St
             Object value = entry.getValue();
 
             writer.writeStartElement(Constants.SCA10_NS, "property" );
-            writer.writeAttribute("name", key.toString());
+            if (key != null){
+                writer.writeAttribute("name", key.toString());
+            }
 
             if ( value instanceof String) {
                 writer.writeCharacters( value.toString() );