Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 627CFDB44 for ; Fri, 3 Aug 2012 22:24:04 +0000 (UTC) Received: (qmail 56123 invoked by uid 500); 3 Aug 2012 22:24:04 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 56095 invoked by uid 500); 3 Aug 2012 22:24:04 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 56082 invoked by uid 99); 3 Aug 2012 22:24:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Aug 2012 22:24:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Aug 2012 22:24:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BA46D23888FD for ; Fri, 3 Aug 2012 22:23:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Fri, 03 Aug 2012 22:23:19 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120803222319.BA46D23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 WebBeansXMLConfigurator @@ -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; }