opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.11'

Browse Source 
* stable-2.11:
  Inline edit: Strip trailing blank lines from commit messages
  Tweak JS clipboard API integration to work on Firefox
  Include server config module in init step
  JarScanner: Fix minor typo in log message
  Silence meaningless warnings from JarScanner

Change-Id: Ie928190f4c8f31a1bbfcc640b5c7a9f4109de5ff
This commit is contained in:
David Pursehouse
2015-10-26 18:32:56 +09:00
parent 39db6c73e6 1713820b47
commit c9023b23d6
7 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarScanner.java
View File

@@ -102,19 +102,19 @@ public class JarScanner implements PluginContentScanner {
throw new InvalidPluginException("Cannot auto-register", err);
} catch (RuntimeException err) {
PluginLoader.log.warn(String.format(
"Plugin %s has invaild class file %s inside of %s", pluginName,
"Plugin %s has invalid class file %s inside of %s", pluginName,
entry.getName(), jarFile.getName()), err);
continue;
}
if (def.isConcrete()) {
if (!Strings.isNullOrEmpty(def.annotationName)) {
rawMap.put(def.annotationName, def);
if (!Strings.isNullOrEmpty(def.annotationName)) {
if (def.isConcrete()) {
rawMap.put(def.annotationName, def);
} else {
PluginLoader.log.warn(String.format(
"Plugin %s tries to @%s(\"%s\") abstract class %s", pluginName,
def.annotationName, def.annotationValue, def.className));
}
} else {
PluginLoader.log.warn(String.format(
"Plugin %s tries to @%s(\"%s\") abstract class %s", pluginName,
def.annotationName, def.annotationValue, def.className));
}
}