svn commit: r1680660 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: config/BeansDeployer.java corespi/se/DefaultContextsService.java

[struberg]

Author: struberg
Date: Wed May 20 19:20:50 2015
New Revision: 1680660

URL: http://svn.apache.org/r1680660
Log:
collapse statements

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1680660&r1=1680659&r2=1680660&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
 Wed May 20 19:20:50 2015
@@ -869,13 +869,10 @@ public class BeansDeployer
                     }
                     else
                     {
-                        if(part != null)
+                        if(part != null && part.equals(other))
                         {
-                            if(part.equals(other))
-                            {
-                                throw new WebBeansDeploymentException("EL name 
of one bean is of the form x.y, where y is a valid bean EL name, and " +
-                                        "x is the EL name of the other bean 
for the bean name : " + beanName);
-                            }                        
+                            throw new WebBeansDeploymentException("EL name of 
one bean is of the form x.y, where y is a valid bean EL name, and " +
+                                    "x is the EL name of the other bean for 
the bean name : " + beanName);
                         }
                     }
                 }                

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java?rev=1680660&r1=1680659&r2=1680660&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
 Wed May 20 19:20:50 2015
@@ -176,13 +176,12 @@ public class DefaultContextsService exte
             // do nothing for Dependent.class
 
         }
-        catch(Exception e)
+        catch (ContextException ce)
+        {
+            throw ce;
+        }
+        catch (Exception e)
         {
-            if(e instanceof ContextException)
-            {
-                throw (ContextException)e;
-            }
-            
             throw new ContextException(e);
         }        
     }