[jboss-cvs] jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services ...

[Chris Laprun]

  User: claprun 
  Date: 06/07/12 13:52:43

  Modified:    wsrp/src/main/org/jboss/portal/wsrp/services 
                        AbstractJNDIServiceFactory.java
  Log:
  Fixed incorrect deployment of WSRP.
  
  Revision  Changes    Path
  1.3       +20 -13    jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractJNDIServiceFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- AbstractJNDIServiceFactory.java	10 Jul 2006 10:26:51 -0000	1.2
  +++ AbstractJNDIServiceFactory.java	12 Jul 2006 17:52:43 -0000	1.3
  @@ -30,33 +30,37 @@
   import java.util.Map;
   import java.util.Properties;
   
  -import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
  -
   /**
    * A service factory implementation that get the services using JNDI lookups.
    *
  - * Rename to AbstractJNDIServiceFactory.
  - *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
    * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @noinspection ALL
    * @since 2.4
    */
   public abstract class AbstractJNDIServiceFactory extends AbstractJBossService implements ServiceFactory
   {
   
  -   /** The logger. */
  +   /**
  +    * The logger.
  +    */
      protected final Logger log = Logger.getLogger(getClass());
   
  -   /** The JNDI configuration. */
  +   /**
  +    * The JNDI configuration.
  +    */
      private Properties env;
   
  -   /** A Map recording the mapping between WSRP port type class name and JDNI name of the implementing service. */
  +   /**
  +    * A Map recording the mapping between WSRP port type class name and JDNI name of the implementing service.
  +    */
      protected Properties portJNDIMapping;
   
      protected void createService() throws Exception
      {
  +      if (env != null)
  +      {
         for (Iterator i = env.entrySet().iterator(); i.hasNext();)
         {
            Map.Entry entry = (Map.Entry)i.next();
  @@ -64,6 +68,9 @@
            String value = (String)entry.getValue();
            log.debug("Use env property " + name + "=" + value);
         }
  +         return;
  +      }
  +      log.debug("createService: null env");
      }
   
      public Properties getEnv()