use .equals() rather than == since the level string is not always the same object instance as defined by the RackLogger interface

tomcz · kares · commit 51b86c28f58a · 2013-09-01T13:00:26.000+02:00
diff --git a/src/main/java/org/jruby/rack/logging/CommonsLoggingLogger.java b/src/main/java/org/jruby/rack/logging/CommonsLoggingLogger.java
@@ -33,16 +33,16 @@ public void log(String message, Throwable ex) {
     }
     
     public void log(String level, String message) {
-        if (level == ERROR) {
+        if (ERROR.equals(level)) {
             logger.error(message);
         }
-        else if (level == WARN) {
+        else if (WARN.equals(level)) {
             logger.warn(message);
         }
-        else if (level == INFO) {
+        else if (INFO.equals(level)) {
             logger.info(message);
         }
-        else if (level == DEBUG) {
+        else if (DEBUG.equals(level)) {
             logger.debug(message);
         }
         else {
@@ -51,16 +51,16 @@ else if (level == DEBUG) {
     }
 
     public void log(String level, String message, Throwable e) {
-        if (level == ERROR) {
+        if (ERROR.equals(level)) {
             logger.error(message, e);
         }
-        else if (level == WARN) {
+        else if (WARN.equals(level)) {
             logger.warn(message, e);
         }
-        else if (level == INFO) {
+        else if (INFO.equals(level)) {
             logger.info(message, e);
         }
-        else if (level == DEBUG) {
+        else if (DEBUG.equals(level)) {
             logger.debug(message, e);
         }
         else {
diff --git a/src/main/java/org/jruby/rack/logging/JulLogger.java b/src/main/java/org/jruby/rack/logging/JulLogger.java
@@ -48,10 +48,10 @@ public void log(String level, String message, Throwable e) {
     }
     
     private static Level mapLevel(String level, Level defaultLevel) {
-        if ( level == ERROR ) return Level.SEVERE;
-        if ( level == WARN )  return Level.WARNING;
-        if ( level == INFO )  return Level.INFO;
-        if ( level == DEBUG ) return Level.FINE;
+        if (ERROR.equals(level)) return Level.SEVERE;
+        if (WARN.equals(level))  return Level.WARNING;
+        if (INFO.equals(level))  return Level.INFO;
+        if (DEBUG.equals(level)) return Level.FINE;
         return defaultLevel;
     }
     
diff --git a/src/main/java/org/jruby/rack/logging/Log4jLogger.java b/src/main/java/org/jruby/rack/logging/Log4jLogger.java
@@ -36,16 +36,16 @@ public void log(String message, Throwable ex) {
     }
 
     public void log(String level, String message) {
-        if (level == ERROR) {
+        if (ERROR.equals(level)) {
             logger.error(message);
         }
-        else if (level == WARN) {
+        else if (WARN.equals(level)) {
             logger.warn(message);
         }
-        else if (level == INFO) {
+        else if (INFO.equals(level)) {
             logger.info(message);
         }
-        else if (level == DEBUG) {
+        else if (DEBUG.equals(level)) {
             logger.debug(message);
         }
         else {
@@ -54,16 +54,16 @@ else if (level == DEBUG) {
     }
 
     public void log(String level, String message, Throwable e) {
-        if (level == ERROR) {
+        if (ERROR.equals(level)) {
             logger.error(message, e);
         }
-        else if (level == WARN) {
+        else if (WARN.equals(level)) {
             logger.warn(message, e);
         }
-        else if (level == INFO) {
+        else if (INFO.equals(level)) {
             logger.info(message, e);
         }
-        else if (level == DEBUG) {
+        else if (DEBUG.equals(level)) {
             logger.debug(message, e);
         }
         else {
diff --git a/src/main/java/org/jruby/rack/logging/Slf4jLogger.java b/src/main/java/org/jruby/rack/logging/Slf4jLogger.java
@@ -32,16 +32,16 @@ public void log(String message, Throwable ex) {
     }
     
     public void log(String level, String message) {
-        if (level == ERROR) {
+        if (ERROR.equals(level)) {
             logger.error(message);
         }
-        else if (level == WARN) {
+        else if (WARN.equals(level)) {
             logger.warn(message);
         }
-        else if (level == INFO) {
+        else if (INFO.equals(level)) {
             logger.info(message);
         }
-        else if (level == DEBUG) {
+        else if (DEBUG.equals(level)) {
             logger.debug(message);
         }
         else {
@@ -50,16 +50,16 @@ else if (level == DEBUG) {
     }
 
     public void log(String level, String message, Throwable e) {
-        if (level == ERROR) {
+        if (ERROR.equals(level)) {
             logger.error(message, e);
         }
-        else if (level == WARN) {
+        else if (WARN.equals(level)) {
             logger.warn(message, e);
         }
-        else if (level == INFO) {
+        else if (INFO.equals(level)) {
             logger.info(message, e);
         }
-        else if (level == DEBUG) {
+        else if (DEBUG.equals(level)) {
             logger.debug(message, e);
         }
         else {

Original file line number	Diff line number	Diff line change
`@@ -33,16 +33,16 @@ public void log(String message, Throwable ex) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public void log(String level, String message) {`
`36`		`- if (level == ERROR) {`
	`36`	`+ if (ERROR.equals(level)) {`
`37`	`37`	`logger.error(message);`
`38`	`38`	`}`
`39`		`- else if (level == WARN) {`
	`39`	`+ else if (WARN.equals(level)) {`
`40`	`40`	`logger.warn(message);`
`41`	`41`	`}`
`42`		`- else if (level == INFO) {`
	`42`	`+ else if (INFO.equals(level)) {`
`43`	`43`	`logger.info(message);`
`44`	`44`	`}`
`45`		`- else if (level == DEBUG) {`
	`45`	`+ else if (DEBUG.equals(level)) {`
`46`	`46`	`logger.debug(message);`
`47`	`47`	`}`
`48`	`48`	`else {`
`@@ -51,16 +51,16 @@ else if (level == DEBUG) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public void log(String level, String message, Throwable e) {`
`54`		`- if (level == ERROR) {`
	`54`	`+ if (ERROR.equals(level)) {`
`55`	`55`	`logger.error(message, e);`
`56`	`56`	`}`
`57`		`- else if (level == WARN) {`
	`57`	`+ else if (WARN.equals(level)) {`
`58`	`58`	`logger.warn(message, e);`
`59`	`59`	`}`
`60`		`- else if (level == INFO) {`
	`60`	`+ else if (INFO.equals(level)) {`
`61`	`61`	`logger.info(message, e);`
`62`	`62`	`}`
`63`		`- else if (level == DEBUG) {`
	`63`	`+ else if (DEBUG.equals(level)) {`
`64`	`64`	`logger.debug(message, e);`
`65`	`65`	`}`
`66`	`66`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,10 @@ public void log(String level, String message, Throwable e) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private static Level mapLevel(String level, Level defaultLevel) {`
`51`		`- if ( level == ERROR ) return Level.SEVERE;`
`52`		`- if ( level == WARN ) return Level.WARNING;`
`53`		`- if ( level == INFO ) return Level.INFO;`
`54`		`- if ( level == DEBUG ) return Level.FINE;`
	`51`	`+ if (ERROR.equals(level)) return Level.SEVERE;`
	`52`	`+ if (WARN.equals(level)) return Level.WARNING;`
	`53`	`+ if (INFO.equals(level)) return Level.INFO;`
	`54`	`+ if (DEBUG.equals(level)) return Level.FINE;`
`55`	`55`	`return defaultLevel;`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -36,16 +36,16 @@ public void log(String message, Throwable ex) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public void log(String level, String message) {`
`39`		`- if (level == ERROR) {`
	`39`	`+ if (ERROR.equals(level)) {`
`40`	`40`	`logger.error(message);`
`41`	`41`	`}`
`42`		`- else if (level == WARN) {`
	`42`	`+ else if (WARN.equals(level)) {`
`43`	`43`	`logger.warn(message);`
`44`	`44`	`}`
`45`		`- else if (level == INFO) {`
	`45`	`+ else if (INFO.equals(level)) {`
`46`	`46`	`logger.info(message);`
`47`	`47`	`}`
`48`		`- else if (level == DEBUG) {`
	`48`	`+ else if (DEBUG.equals(level)) {`
`49`	`49`	`logger.debug(message);`
`50`	`50`	`}`
`51`	`51`	`else {`
`@@ -54,16 +54,16 @@ else if (level == DEBUG) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public void log(String level, String message, Throwable e) {`
`57`		`- if (level == ERROR) {`
	`57`	`+ if (ERROR.equals(level)) {`
`58`	`58`	`logger.error(message, e);`
`59`	`59`	`}`
`60`		`- else if (level == WARN) {`
	`60`	`+ else if (WARN.equals(level)) {`
`61`	`61`	`logger.warn(message, e);`
`62`	`62`	`}`
`63`		`- else if (level == INFO) {`
	`63`	`+ else if (INFO.equals(level)) {`
`64`	`64`	`logger.info(message, e);`
`65`	`65`	`}`
`66`		`- else if (level == DEBUG) {`
	`66`	`+ else if (DEBUG.equals(level)) {`
`67`	`67`	`logger.debug(message, e);`
`68`	`68`	`}`
`69`	`69`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -32,16 +32,16 @@ public void log(String message, Throwable ex) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public void log(String level, String message) {`
`35`		`- if (level == ERROR) {`
	`35`	`+ if (ERROR.equals(level)) {`
`36`	`36`	`logger.error(message);`
`37`	`37`	`}`
`38`		`- else if (level == WARN) {`
	`38`	`+ else if (WARN.equals(level)) {`
`39`	`39`	`logger.warn(message);`
`40`	`40`	`}`
`41`		`- else if (level == INFO) {`
	`41`	`+ else if (INFO.equals(level)) {`
`42`	`42`	`logger.info(message);`
`43`	`43`	`}`
`44`		`- else if (level == DEBUG) {`
	`44`	`+ else if (DEBUG.equals(level)) {`
`45`	`45`	`logger.debug(message);`
`46`	`46`	`}`
`47`	`47`	`else {`
`@@ -50,16 +50,16 @@ else if (level == DEBUG) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public void log(String level, String message, Throwable e) {`
`53`		`- if (level == ERROR) {`
	`53`	`+ if (ERROR.equals(level)) {`
`54`	`54`	`logger.error(message, e);`
`55`	`55`	`}`
`56`		`- else if (level == WARN) {`
	`56`	`+ else if (WARN.equals(level)) {`
`57`	`57`	`logger.warn(message, e);`
`58`	`58`	`}`
`59`		`- else if (level == INFO) {`
	`59`	`+ else if (INFO.equals(level)) {`
`60`	`60`	`logger.info(message, e);`
`61`	`61`	`}`
`62`		`- else if (level == DEBUG) {`
	`62`	`+ else if (DEBUG.equals(level)) {`
`63`	`63`	`logger.debug(message, e);`
`64`	`64`	`}`
`65`	`65`	`else {`