cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject svn commit: r1403706 - /cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
Date Tue, 30 Oct 2012 14:03:16 GMT
Author: asoldano
Date: Tue Oct 30 14:03:15 2012
New Revision: 1403706

URL: http://svn.apache.org/viewvc?rev=1403706&view=rev
Log:
[CXF-4602] Fixing 2.5.x branch build currently failing due to incomplete conflict resolution

Modified:
    cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java

Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java?rev=1403706&r1=1403705&r2=1403706&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
(original)
+++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
Tue Oct 30 14:03:15 2012
@@ -228,31 +228,6 @@ public final class LogUtils {
     protected static Logger createLogger(Class<?> cls, 
                                          String name, 
                                          String loggerName) {
-<<<<<<< HEAD:common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
-        if (loggerClass != null) {
-            try {
-                Constructor cns = loggerClass.getConstructor(String.class, String.class);
-                if (name == null) {
-                    try {
-                        return (Logger) cns.newInstance(loggerName, BundleUtils.getBundleName(cls));
-                    } catch (InvocationTargetException ite) {
-                        if (ite.getTargetException() instanceof MissingResourceException)
{
-                            return (Logger) cns.newInstance(loggerName, null);
-                        } else {
-                            throw ite;
-                        }
-                    } 
-                } else {
-                    try {
-                        return (Logger) cns.newInstance(loggerName, BundleUtils.getBundleName(cls,
name));
-                    } catch (InvocationTargetException ite) {
-                        if (ite.getTargetException() instanceof MissingResourceException)
{
-                            throw (MissingResourceException)ite.getTargetException();
-                        } else {
-                            throw ite;
-                        }
-                    } 
-=======
         ClassLoader orig = Thread.currentThread().getContextClassLoader();
         ClassLoader n = cls.getClassLoader();
         if (n != null) {
@@ -285,7 +260,6 @@ public final class LogUtils {
                     }
                 } catch (Exception e) {
                     throw new RuntimeException(e);
->>>>>>> bb4cfa6... Merged revisions 1402160 via  git cherry-pick from:api/src/main/java/org/apache/cxf/common/logging/LogUtils.java
                 }
             }
             if (name == null) {



Mime
View raw message