You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2012/08/04 00:23:19 UTC
svn commit: r1369234 - in /openwebbeans/trunk:
webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
Author: struberg
Date: Fri Aug 3 22:23:19 2012
New Revision: 1369234
URL: http://svn.apache.org/viewvc?rev=1369234&view=rev
Log:
OWB-691 fix sonar findings
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java?rev=1369234&r1=1369233&r2=1369234&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java Fri Aug 3 22:23:19 2012
@@ -60,7 +60,7 @@ public final class WebBeansXMLConfigurat
/**
* Current configuration file name
*/
- private String CURRENT_SCAN_FILE_NAME = null;
+ private String currentScanFileName = null;
/**
* Creates a new instance of the <code>WebBeansXMLConfigurator</code>
@@ -152,7 +152,7 @@ public final class WebBeansXMLConfigurat
Asserts.assertNotNull(xmlStream, "xmlStream parameter can not be null!");
Asserts.assertNotNull(fileName, "fileName parameter can not be null!");
- CURRENT_SCAN_FILE_NAME = fileName;
+ currentScanFileName = fileName;
//Get root element of the XML document
Element webBeansRoot = getSpecStrictRootElement(xmlStream);
@@ -454,7 +454,7 @@ public final class WebBeansXMLConfigurat
*/
private String createConfigurationFailedMessage()
{
- return "WebBeans XML configuration defined in " + CURRENT_SCAN_FILE_NAME + " is failed. Reason is : ";
+ return "WebBeans XML configuration defined in " + currentScanFileName + " is failed. Reason is : ";
}
}
Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java?rev=1369234&r1=1369233&r2=1369234&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java (original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java Fri Aug 3 22:23:19 2012
@@ -230,8 +230,7 @@ public class DefaultOwbFailOverService i
if (handler != null)
{
return handler.handleResource(bean, resourceObject, in, out,
- (Boolean.TRUE == isForPassivation.get()) ?
- SerializationHandlerV10.TYPE_PASSIVATION : SerializationHandlerV10.TYPE_FAILOVER);
+ (isForPassivation.get()) ? SerializationHandlerV10.TYPE_PASSIVATION : SerializationHandlerV10.TYPE_FAILOVER);
}
return NOT_HANDLED;
}