Please remove the System.out.println calls and replace with code to get the
message text and log the errors in an appropriate manner.

Thanks

Rich Scheuerle
XML & Web Services Development
512-838-5115  (IBM TL 678-5115)


                                                                                       
                                     
                      [EMAIL PROTECTED]                                                  
                                     
                                               To:       [EMAIL PROTECTED]       
                                     
                      05/01/2002 02:29         cc:                                     
                                     
                      PM                       Subject:  cvs commit: 
xml-soap/java/src/org/apache/soap/providers            
                      Please respond to         EntityEJBProvider.java 
StatefulEJBProvider.java StatelessEJBProvider.java   
                      soap-dev                                                         
                                     
                                                                                       
                                     
                                                                                       
                                     



nagy        02/05/01 12:29:52

  Modified:    java/src/org/apache/soap/providers EntityEJBProvider.java
                        StatefulEJBProvider.java StatelessEJBProvider.java
  Log:
  Fixed a bug in the EJB providers which printed out the wrong error
message.  Changed context intialization to allow the specification of the
PROVIDER_URL and INITIAL_CONTEXT_FACTORY separately.
  Submitted by: Gianpiero Caretti ([EMAIL PROTECTED])
  Reviewed by: Bill Nagy ([EMAIL PROTECTED])

  Revision  Changes    Path
  1.4       +1 -1
xml-soap/java/src/org/apache/soap/providers/EntityEJBProvider.java

  Index: EntityEJBProvider.java
  ===================================================================
  RCS file:
/home/cvs/xml-soap/java/src/org/apache/soap/providers/EntityEJBProvider.java,v

  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EntityEJBProvider.java         7 Apr 2001 01:46:49 -0000
1.3
  +++ EntityEJBProvider.java         1 May 2002 19:29:52 -0000
1.4
  @@ -58,7 +58,7 @@
       String ContxtProviderURL = (String) props.get("ContextProviderURL");
       String ContxtFactoryName = (String) props.get
("FullContextFactoryName");

  -    if ((ContxtProviderURL != null) && (ContxtFactoryName != null))
  +    if ((ContxtProviderURL != null) || (ContxtFactoryName != null))
         initialize(ContxtProviderURL, ContxtFactoryName);
       else
         initialize(CNTXT_PROVIDER_URL, CNTXT_FACTORY_NAME);



  1.8       +22 -7
xml-soap/java/src/org/apache/soap/providers/StatefulEJBProvider.java

  Index: StatefulEJBProvider.java
  ===================================================================
  RCS file:
/home/cvs/xml-soap/java/src/org/apache/soap/providers/StatefulEJBProvider.java,v

  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StatefulEJBProvider.java             25 May 2001 19:24:29 -0000
 1.7
  +++ StatefulEJBProvider.java             1 May 2002 19:29:52 -0000
 1.8
  @@ -104,15 +104,30 @@
       return null;
     }

  -  protected void initialize(String url, String factory) throws
SOAPException {
  -    if (contxt == null) {
  +  protected void initialize(String url, String factory)
  +    throws SOAPException
  +  {
  +    if (contxt == null)
  +    {
         Properties properties = new Properties();
  -      properties.put(Context.PROVIDER_URL, url);
  -      properties.put(Context.INITIAL_CONTEXT_FACTORY, factory);
  -      try {
  +
  +      if ((url != null) && (!url.trim().equals("")))
  +      {
  +          properties.put(Context.PROVIDER_URL, url);
  +      }
  +      if ((factory != null) && (!factory.trim().equals("")))
  +      {
  +          properties.put(Context.INITIAL_CONTEXT_FACTORY, factory);
  +      }
  +
  +      try
  +      {
           contxt = new InitialContext(properties);
  -      } catch (NamingException ne) {
  +      }
  +      catch (NamingException ne)
  +      {
           // ErrorListener?
  +          System.out.println("Naming Exception caught during
InitialContext creation @ " + url);
           throw new SOAPException(Constants.FAULT_CODE_SERVER,
                                   "Unable to initialize context");
         }
  @@ -244,7 +259,7 @@
       String ContxtProviderURL = (String) props.get("ContextProviderURL");
       String ContxtFactoryName = (String) props.get
("FullContextFactoryName");

  -    if ((ContxtProviderURL != null) && (ContxtFactoryName != null))
  +    if ((ContxtProviderURL != null) || (ContxtFactoryName != null))
         initialize(ContxtProviderURL, ContxtFactoryName);
       else
         initialize(CNTXT_PROVIDER_URL, CNTXT_FACTORY_NAME);



  1.6       +29 -20
xml-soap/java/src/org/apache/soap/providers/StatelessEJBProvider.java

  Index: StatelessEJBProvider.java
  ===================================================================
  RCS file:
/home/cvs/xml-soap/java/src/org/apache/soap/providers/StatelessEJBProvider.java,v

  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StatelessEJBProvider.java            25 May 2001 19:24:31 -0000
 1.5
  +++ StatelessEJBProvider.java            1 May 2002 19:29:52 -0000
 1.6
  @@ -113,25 +113,34 @@

   }

  -private void initialize(String url, String factory) throws SOAPException
{
  -
  -        if(contxt == null) {
  -
  -                java.util.Properties properties = new
java.util.Properties();
  -
  -                properties.put(javax.naming.Context.PROVIDER_URL, url);
  -
properties.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, factory);
  -
  -                try {
  -                        contxt = new
javax.naming.InitialContext(properties);
  -                } catch (NamingException ne) {
  -                        // ErrorListener?
  -                        System.out.println("Naming Exception caught
during InitialContext creation @ " + CNTXT_PROVIDER_URL);
  -                        throw new
SOAPException(Constants.FAULT_CODE_SERVER, "Unable to initialize context");
  -                }
  -        }
  -
  -}
  +  private void initialize(String url, String factory)
  +    throws SOAPException
  +  {
  +    if(contxt == null)
  +    {
  +      java.util.Properties properties = new java.util.Properties();
  +
  +      if ((url != null) && (!url.trim().equals("")))
  +      {
  +          properties.put(javax.naming.Context.PROVIDER_URL, url);
  +      }
  +      if ((factory != null) && (!factory.trim().equals("")))
  +      {
  +          properties.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
factory);
  +      }
  +
  +      try
  +      {
  +          contxt = new javax.naming.InitialContext(properties);
  +      }
  +      catch (NamingException ne)
  +      {
  +          // ErrorListener?
  +          System.out.println("Naming Exception caught during
InitialContext creation @ " + url);
  +          throw new SOAPException(Constants.FAULT_CODE_SERVER, "Unable
to initialize context");
  +      }
  +    }
  +  }


   /**
  @@ -244,7 +253,7 @@
           String ContxtProviderURL = (String) props.get
("ContextProviderURL");
           String ContxtFactoryName = (String) props.get
("FullContextFactoryName");

  -        if ((ContxtProviderURL != null) && (ContxtFactoryName != null))
  +        if ((ContxtProviderURL != null) || (ContxtFactoryName != null))
                   initialize(ContxtProviderURL, ContxtFactoryName);
           else
                   initialize();






Reply via email to