svn commit: r914998 - /abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServiceManager.java

[ca...@apache.org]

Author: calavera
Date: Mon Feb 22 18:11:00 2010
New Revision: 914998

URL: http://svn.apache.org/viewvc?rev=914998&view=rev
Log:
fixing providers discovering errors. Now we just need to fix the failing tests

Modified:
    abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServiceManager.java

Modified: abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServiceManager.java?rev=914998&r1=914997&r2=914998&view=diff
==============================================================================
--- abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServiceManager.java (original)
+++ abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServiceManager.java Mon Feb 22 18:11:00 2010
@@ -63,14 +63,11 @@
     Map<String,String> properties) {
     Abdera abdera = getAbdera();
     String instance = properties.get(PROVIDER);
+    if (instance == null) {
+    	instance = DefaultProvider.class.getName();
+    }
     log.debug(Localizer.sprintf("CREATING.NEW.INSTANCE","Provider"));
-    Provider provider = 
-      (Provider) Discover.locate(
-        PROVIDER, 
-        (instance != null) ? 
-          instance : 
-          DefaultProvider.class.getName(),
-        abdera);
+    Provider provider = (Provider) Discover.locate(PROVIDER, instance);
     log.debug(Localizer.sprintf("INITIALIZING.INSTANCE", "Provider"));
     provider.init(abdera, properties);
     return provider;