svn commit: r927321 - /synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorSerializer.java

[su...@apache.org]

Author: supun
Date: Thu Mar 25 09:59:52 2010
New Revision: 927321

URL: http://svn.apache.org/viewvc?rev=927321&view=rev
Log:
Fixing a small with default prefixes

Modified:
    synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorSerializer.java

Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorSerializer.java?rev=927321&r1=927320&r2=927321&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorSerializer.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/config/PriorityExecutorSerializer.java Thu Mar 25 09:59:52 2010
@@ -31,18 +31,11 @@ import java.util.List;
 public class PriorityExecutorSerializer {
 
     public static OMElement serialize(OMElement parent,
-                                      PriorityExecutor executor, String namespace) {        
-
-        QName executorQName = createQname(namespace, ExecutorConstants.PRIORITY_EXECUTOR);
-        QName queuesQName = createQname(namespace, ExecutorConstants.QUEUES);
-        QName queueQName = createQname(namespace, ExecutorConstants.QUEUE);
-        QName threadsQName = createQname(namespace, ExecutorConstants.THREADS);
-
-
+                                      PriorityExecutor executor, String namespace) {
         OMFactory fac = OMAbstractFactory.getOMFactory();
-        OMElement executorElement = fac.createOMElement(executorQName);
         OMNamespace nullNS = fac.createOMNamespace("", "");
 
+        OMElement executorElement = createElement(ExecutorConstants.PRIORITY_EXECUTOR, namespace);
         if (executor.getName() != null) {
             executorElement.addAttribute(fac.createOMAttribute(ExecutorConstants.NAME,
                     nullNS, executor.getName()));
@@ -57,11 +50,11 @@ public class PriorityExecutorSerializer 
         // create the queues configuration
         MultiPriorityBlockingQueue queue = executor.getQueue();
         NextQueueAlgorithm algo = queue.getNextQueueAlgorithm();
-        OMElement queuesEle = fac.createOMElement(queuesQName);
+        OMElement queuesEle = createElement(ExecutorConstants.QUEUES, namespace);
 
         if (!(algo instanceof PRRNextQueueAlgorithm)) {
             queuesEle.addAttribute(fac.createOMAttribute(ExecutorConstants.NEXT_QUEUE, nullNS,
-                    algo.getClass().getName()));            
+                    algo.getClass().getName()));
         }
 
         if (!queue.isFixedSizeQueues()) {
@@ -71,7 +64,7 @@ public class PriorityExecutorSerializer 
 
         List<InternalQueue> intQueues = queue.getQueues();
         for (InternalQueue intQueue : intQueues) {
-            OMElement queueEle = fac.createOMElement(queueQName);
+            OMElement queueEle = createElement(ExecutorConstants.QUEUE, namespace);
 
             if (queue.isFixedSizeQueues()) {
                 queueEle.addAttribute(fac.createOMAttribute(ExecutorConstants.SIZE, nullNS,
@@ -86,7 +79,7 @@ public class PriorityExecutorSerializer 
         executorElement.addChild(queuesEle);
 
         // create the Threads configuration
-        OMElement threadsEle = fac.createOMElement(threadsQName);
+        OMElement threadsEle = createElement(ExecutorConstants.THREADS, namespace);
         threadsEle.addAttribute(fac.createOMAttribute(
                 ExecutorConstants.MAX, nullNS, Integer.toString(executor.getMax())));
         threadsEle.addAttribute(fac.createOMAttribute(
@@ -103,11 +96,19 @@ public class PriorityExecutorSerializer 
         return executorElement;
     }
 
-    private static QName createQname(String namespace, String name) {
+    /**
+     * Create an OMElement with the given name.
+     * @param name name of the element
+     * @param namespace if null element won't have a namespace
+     * @return created OMElement
+     */
+    private static OMElement createElement(String name, String namespace) {
+        OMFactory fac = OMAbstractFactory.getOMFactory();
         if (namespace == null) {
-            return new QName(name);
+            return fac.createOMElement(new QName(name));
         }
-        return new QName(namespace, name, "syn");
-    }
-}
 
+        OMNamespace omNamespace = fac.createOMNamespace(namespace, "");
+        return fac.createOMElement(name, omNamespace);
+    }
+}
\ No newline at end of file