Merge pull request ome#90 from melissalinkert/fix-gh-89

dgault · web-flow · commit 007890128d73 · 2024-07-19T09:14:07.000+01:00
Fix string comparison
diff --git a/src/main/java/loci/common/LogbackTools.java b/src/main/java/loci/common/LogbackTools.java
@@ -69,7 +69,7 @@ public static synchronized boolean isEnabled() {
     Logger root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
     LoggerContext loggerContext = root.getLoggerContext();
     return (ConfigurationWatchListUtil.getMainWatchURL(loggerContext) != null
-            || (loggerContext.getProperty("caller") == CALLER));
+            || (loggerContext.getProperty("caller").equals(CALLER)));
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static synchronized boolean isEnabled() {`
`69`	`69`	`Logger root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);`
`70`	`70`	`LoggerContext loggerContext = root.getLoggerContext();`
`71`	`71`	`return (ConfigurationWatchListUtil.getMainWatchURL(loggerContext) != null`
`72`		`- \|\| (loggerContext.getProperty("caller") == CALLER));`
	`72`	`+ \|\| (loggerContext.getProperty("caller").equals(CALLER)));`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`