[jboss-svn-commits] JBoss Common SVN: r4814 - in slf4j-jboss-logmanager/trunk: src/main/java/org/slf4j/impl and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2010-07-29 18:15:55 -0400 (Thu, 29 Jul 2010)
New Revision: 4814

Modified:
   slf4j-jboss-logmanager/trunk/pom.xml
   slf4j-jboss-logmanager/trunk/src/main/java/org/slf4j/impl/Slf4jLoggerFactory.java
Log:
Use new logmanager API to speed up attachment lookup

Modified: slf4j-jboss-logmanager/trunk/pom.xml
===================================================================
--- slf4j-jboss-logmanager/trunk/pom.xml	2010-07-29 21:44:06 UTC (rev 4813)
+++ slf4j-jboss-logmanager/trunk/pom.xml	2010-07-29 22:15:55 UTC (rev 4814)
@@ -30,28 +30,22 @@
     <artifactId>slf4j-jboss-logmanager</artifactId>
     <packaging>jar</packaging>
     <version>1.0.0.CR3-SNAPSHOT</version>
+
+    <name>SLF4J: JBoss Log Manager</name>
+
+    <parent>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-parent</artifactId>
+        <version>5</version>
+    </parent>
+
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
@@ -59,19 +53,14 @@
         <dependency>
             <groupId>org.jboss.logmanager</groupId>
             <artifactId>jboss-logmanager</artifactId>
-            <version>1.1.0.CR6</version>
+            <version>1.2.0.CR4-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.5.6</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
-    <distributionManagement>
-        <repository>
-            <id>repository.jboss.org</id>
-            <name>JBoss Maven2 Repository</name>
-            <url>http://repository.jboss.org/maven2</url>
-        </repository>
-    </distributionManagement>
 </project>

Modified: slf4j-jboss-logmanager/trunk/src/main/java/org/slf4j/impl/Slf4jLoggerFactory.java
===================================================================
--- slf4j-jboss-logmanager/trunk/src/main/java/org/slf4j/impl/Slf4jLoggerFactory.java	2010-07-29 21:44:06 UTC (rev 4813)
+++ slf4j-jboss-logmanager/trunk/src/main/java/org/slf4j/impl/Slf4jLoggerFactory.java	2010-07-29 22:15:55 UTC (rev 4814)
@@ -31,8 +31,12 @@
     private static final org.jboss.logmanager.Logger.AttachmentKey<Logger> key = new org.jboss.logmanager.Logger.AttachmentKey<Logger>();
 
     public Logger getLogger(final String name) {
+        Logger logger = LogContext.getLogContext().getAttachment(name, key);
+        if (logger != null) {
+            return logger;
+        }
         final org.jboss.logmanager.Logger lmLogger = LogContext.getLogContext().getLogger(name);
-        final Logger logger = lmLogger.getAttachment(key);
+        logger = lmLogger.getAttachment(key);
         if (logger != null) {
             return logger;
         }