You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by km...@apache.org on 2007/10/05 19:39:02 UTC

svn commit: r582357 - in /openejb/trunk/openejb3/container/openejb-core/src/main: java/org/apache/openejb/util/Logger.java resources/logging.properties

Author: kmalhi
Date: Fri Oct  5 10:39:02 2007
New Revision: 582357

URL: http://svn.apache.org/viewvc?rev=582357&view=rev
Log:
Fixed the issue where Logger was writing extra bytes to the logging.properties file.
Also renamed the getFallbackLogger method.

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=582357&r1=582356&r2=582357&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java Fri Oct  5 10:39:02 2007
@@ -199,7 +199,7 @@
         }
 
         if (missing.size() > 0) {
-            org.apache.log4j.Logger logger = getFallabckLogger();
+            org.apache.log4j.Logger logger = getFallbackLogger();
 
             logger.error("Logging may not operate as expected.  The directories for the following files do not exist so no file can be created.  See the list below.");
             for (int i = 0; i < missing.size(); i++) {
@@ -209,7 +209,7 @@
         }
     }
 
-    private static org.apache.log4j.Logger getFallabckLogger() {
+    private static org.apache.log4j.Logger getFallbackLogger() {
         org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger("OpenEJB.logging");
 
         SimpleLayout simpleLayout = new SimpleLayout();
@@ -235,11 +235,8 @@
         InputStream in = resource.openStream();
         in = new BufferedInputStream(in);
         ByteArrayOutputStream bao = new ByteArrayOutputStream();
-        byte buf[] = new byte[4096];
-        int i = in.read(buf);
-        while (i != -1) {
-            bao.write(buf);
-            i = in.read(buf);
+        for(int i = in.read(); i!=-1;i=in.read()){
+        	bao.write(i);
         }
         byte[] byteArray = bao.toByteArray();
         ByteArrayInputStream bis = new ByteArrayInputStream(byteArray);

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties?rev=582357&r1=582356&r2=582357&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties Fri Oct  5 10:39:02 2007
@@ -39,4 +39,4 @@
 log4j.appender.TX.MaxFileSize=1000KB
 log4j.appender.TX.MaxBackupIndex=100
 log4j.appender.TX.File=logs/transaction.log
-log4j.appender.TX.layout.ConversionPattern=%d - %-5p - %m%n
+log4j.appender.TX.layout.ConversionPattern=%d - %-5p - %m%n
\ No newline at end of file