### Eclipse Workspace Patch 1.0
#P petals-kernel-3.1.x
Index: src/main/java/org/ow2/petals/jbi/messaging/routing/module/EndpointResolverModule.java
===================================================================
--- src/main/java/org/ow2/petals/jbi/messaging/routing/module/EndpointResolverModule.java	(revision 16370)
+++ src/main/java/org/ow2/petals/jbi/messaging/routing/module/EndpointResolverModule.java	(working copy)
@@ -535,7 +535,7 @@
                 Iterator<ServiceEndpoint> endpointsIterator = electedEndpoints.iterator();
                 while (endpointsIterator.hasNext()) {
                     final ServiceEndpoint endpoint = endpointsIterator.next();
-                    if (!endpoint.getInterfaces()[0].equals(interfaceName)) {
+                    if (!endpoint.getInterfacesName().get(0).equals(interfaceName)) {
                         endpointsIterator.remove();
                     }
                 }
Index: src/main/java/org/ow2/petals/jbi/messaging/endpoint/JBIServiceEndpointImpl.java
===================================================================
--- src/main/java/org/ow2/petals/jbi/messaging/endpoint/JBIServiceEndpointImpl.java	(revision 16370)
+++ src/main/java/org/ow2/petals/jbi/messaging/endpoint/JBIServiceEndpointImpl.java	(working copy)
@@ -18,6 +18,11 @@
  */
 package org.ow2.petals.jbi.messaging.endpoint;
 
+import static org.ow2.petals.jbi.Constants.ENDPOINT_NAME;
+import static org.ow2.petals.jbi.Constants.EPR_NAME;
+import static org.ow2.petals.jbi.Constants.JBI_NAMESPACE;
+import static org.ow2.petals.jbi.Constants.SERVICE_NAME;
+
 import javax.xml.namespace.QName;
 
 import org.ow2.petals.service.ServiceEndpointImpl;
@@ -26,11 +31,6 @@
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 
-import static org.ow2.petals.jbi.Constants.ENDPOINT_NAME;
-import static org.ow2.petals.jbi.Constants.EPR_NAME;
-import static org.ow2.petals.jbi.Constants.JBI_NAMESPACE;
-import static org.ow2.petals.jbi.Constants.SERVICE_NAME;
-
 /**
  * The JBI implementation of the petals service endpoint
  * 
@@ -44,14 +44,12 @@
      */
     private static final long serialVersionUID = 4487649085296224233L;
 
-    private EndpointType type;
-
     /**
      * 
      */
     public JBIServiceEndpointImpl() {
         super();
-        this.type = EndpointType.INTERNAL;
+        this.setType(EndpointType.INTERNAL);
     }
 
     /**
@@ -76,14 +74,4 @@
     public QName[] getInterfaces() {
         return this.getInterfacesName().toArray(new QName[this.getInterfacesName().size()]);
     }
-
-    @Override
-    public EndpointType getType() {
-        return this.type;
-    }
-
-    @Override
-    public void setType(EndpointType type) {
-        this.type = type;
-    }
 }
Index: src/main/java/org/ow2/petals/jbi/messaging/registry/AbstractEndpointRegistry.java
===================================================================
--- src/main/java/org/ow2/petals/jbi/messaging/registry/AbstractEndpointRegistry.java	(revision 16370)
+++ src/main/java/org/ow2/petals/jbi/messaging/registry/AbstractEndpointRegistry.java	(working copy)
@@ -141,9 +141,9 @@
 	 */
 	protected static final List<String> interfaceQNameToString(
 			ServiceEndpoint abstractEndpoint) {
-		final QName[] interfaces = abstractEndpoint.getInterfaces();
+        final List<QName> interfaces = abstractEndpoint.getInterfacesName();
 		final List<String> interfaceNames = new ArrayList<String>();
-		if ((interfaces != null) && (interfaces.length > 0)) {
+        if ((interfaces != null) && (!interfaces.isEmpty())) {
 			for (final QName interfaceName : interfaces) {
 				interfaceNames.add(interfaceName.toString());
 			}
Index: src/main/java/org/ow2/petals/jbi/messaging/routing/RouterServiceImpl.java
===================================================================
--- src/main/java/org/ow2/petals/jbi/messaging/routing/RouterServiceImpl.java	(revision 16370)
+++ src/main/java/org/ow2/petals/jbi/messaging/routing/RouterServiceImpl.java	(working copy)
@@ -21,6 +21,12 @@
 
 package org.ow2.petals.jbi.messaging.routing;
 
+import static javax.jbi.management.LifeCycleMBean.SHUTDOWN;
+import static javax.jbi.management.LifeCycleMBean.STARTED;
+import static javax.jbi.management.LifeCycleMBean.STOPPED;
+import static javax.jbi.messaging.MessageExchange.Role.CONSUMER;
+import static javax.jbi.messaging.MessageExchange.Role.PROVIDER;
+
 import java.io.IOException;
 import java.util.ConcurrentModificationException;
 import java.util.Hashtable;
@@ -34,8 +40,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import javax.jbi.messaging.MessagingException;
 import javax.jbi.messaging.MessageExchange.Role;
+import javax.jbi.messaging.MessagingException;
 
 import org.objectweb.fractal.fraclet.annotation.annotations.FractalComponent;
 import org.objectweb.fractal.fraclet.annotation.annotations.Interface;
@@ -62,12 +68,6 @@
 import org.ow2.petals.transport.util.TransportSendContext;
 import org.ow2.petals.util.LoggingUtil;
 
-import static javax.jbi.management.LifeCycleMBean.SHUTDOWN;
-import static javax.jbi.management.LifeCycleMBean.STARTED;
-import static javax.jbi.management.LifeCycleMBean.STOPPED;
-import static javax.jbi.messaging.MessageExchange.Role.CONSUMER;
-import static javax.jbi.messaging.MessageExchange.Role.PROVIDER;
-
 /**
  * Routes messages to their destinations. Performs an itinerary resolution,
  * adding for example a transformation service before delivering the message to
@@ -773,7 +773,7 @@
                             exchangeDecorator.setEndpoint(electedEndpoint);
                             exchangeDecorator.setService(electedEndpoint.getServiceName());
                             // the interface list contains 1 interface
-                            exchangeDecorator.setInterfaceName(electedEndpoint.getInterfaces()[0]);
+                            exchangeDecorator.setInterfaceName(electedEndpoint.getInterfacesName().get(0));
                             if (iterator.hasNext() || attemptDelay > 0
                                     || transportSendContext.attempt > 1
                                     || exchangeDecorator.getMessageExchange().isPersisted()) {