Merge pull request #1184 from KevinVdV/DS-2901-fix-broken-equals-methods-itemimport

[DS-2901] Fix broken equals methods found by FindBugs
This commit is contained in:
Mark H. Wood
2015-11-23 11:31:23 -05:00

View File

@@ -1658,7 +1658,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
//regex supports either windows or *nix file paths //regex supports either windows or *nix file paths
String[] entryChunks = entry.getName().split("/|\\\\"); String[] entryChunks = entry.getName().split("/|\\\\");
if(entryChunks.length > 2) { if(entryChunks.length > 2) {
if(sourceDirForZip == sourcedir) { if(StringUtils.equals(sourceDirForZip, sourcedir)) {
sourceDirForZip = sourcedir + "/" + entryChunks[0]; sourceDirForZip = sourcedir + "/" + entryChunks[0];
} }
} }