Config no longer implements Identifiable because this was in violation of the contrac...

[xmlrouter] / impl / src / main / java / org / wamblee / xmlrouter / impl / XMLRouterConfigurationImpl.java

diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java
index 679e55df7baa6f4fe9c71066cc6fa37927c7076a..7c570ff23baaa723c4e0c105919f24751c19702c 100644 (file)
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java
@@ -18,8 +18,8 @@ package org.wamblee.xmlrouter.impl;
 import java.util.ArrayList;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import org.wamblee.general.Pair;
 import org.wamblee.xmlrouter.common.Id;
-import org.wamblee.xmlrouter.config.RouterConfig;
 
 /**
  * Implements the XML Router configuration interface including the required
@@ -49,18 +49,14 @@ public class XMLRouterConfigurationImpl implements XMLRouterConfiguration {
     }
 
     @Override
-    public void startPublishEvent() {
+    public Pair<ExtendedRouterConfig, TransformationPaths> getConfig() {
         rlock.lock();
-    }
-
-    @Override
-    public void endPublishEvent() {
-        rlock.unlock();
-    }
-
-    @Override
-    public ExtendedRouterConfig getRouterConfig() {
-        return config;
+        try {
+            return new Pair<ExtendedRouterConfig, TransformationPaths>(config,
+                transformations);
+        } finally {
+            rlock.unlock();
+        }
     }
 
     @Override
@@ -77,9 +73,4 @@ public class XMLRouterConfigurationImpl implements XMLRouterConfiguration {
             wlock.unlock();
         }
     }
-
-    @Override
-    public TransformationPaths getTransformations() {
-        return transformations;
-    }
 }