From scm-return-47251-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Tue Sep 6 07:02:45 2011 Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 506347D87 for ; Tue, 6 Sep 2011 07:02:45 +0000 (UTC) Received: (qmail 88097 invoked by uid 500); 6 Sep 2011 07:02:44 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 87997 invoked by uid 500); 6 Sep 2011 07:02:39 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 87987 invoked by uid 99); 6 Sep 2011 07:02:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2011 07:02:36 +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; Tue, 06 Sep 2011 07:02:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E0B422388900; Tue, 6 Sep 2011 07:02:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1165515 - /geronimo/server/branches/2.1/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Date: Tue, 06 Sep 2011 07:02:10 -0000 To: scm@geronimo.apache.org From: violalu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110906070210.E0B422388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: violalu Date: Tue Sep 6 07:02:10 2011 New Revision: 1165515 URL: http://svn.apache.org/viewvc?rev=1165515&view=rev Log: GERONIMO-6146 replace tab with 4 space Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java?rev=1165515&r1=1165514&r2=1165515&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java (original) +++ geronimo/server/branches/2.1/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Tue Sep 6 07:02:10 2011 @@ -191,24 +191,24 @@ public class ManagedConnectionFactoryWra ClassLoader oldTCL = thread.getContextClassLoader(); thread.setContextClassLoader(classLoader); try { - //Convert java.util.Properties to java.lang.String - if(value != null && value instanceof Properties){ - Properties ps = (Properties) value; - if (!ps.isEmpty()) { - String s = null; - for (Object o : ps.keySet()) { - String k = (String) o; - String v = ps.getProperty(k); - s = k + "=" + v + ","; - log.debug("Setting " + k + "=" + value); - } - delegate.setAttribute(name, s); - log.debug("Setting " + name + " value " + s); - } - } else { - delegate.setAttribute(name, value); - log.debug("Setting " + name + " value " + value); - } + //Convert java.util.Properties to java.lang.String + if(value != null && value instanceof Properties){ + Properties ps = (Properties) value; + if (!ps.isEmpty()) { + String s = null; + for (Object o : ps.keySet()) { + String k = (String) o; + String v = ps.getProperty(k); + s = k + "=" + v + ","; + log.debug("Setting " + k + "=" + value); + } + delegate.setAttribute(name, s); + log.debug("Setting " + name + " value " + s); + } + } else { + delegate.setAttribute(name, value); + log.debug("Setting " + name + " value " + value); + } } finally { thread.setContextClassLoader(oldTCL); }