Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 23:15:43 +01:00
Code Issues Packages Projects Releases Activity

fix conflict with guava 16

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-03-29 10:30:19 +01:00
parent 07363cbe82
commit 93728e71a1
9 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java
View File

@@ -491,7 +491,7 @@ public class HgHookCallbackServlet extends HttpServlet
}
finally
{
Closeables.closeQuietly(writer);
Closeables.close(writer, true);
}
}
}
@@ -538,14 +538,14 @@ public class HgHookCallbackServlet extends HttpServlet
//~--- fields ---------------------------------------------------------------
/** Field description */
private Provider<HgContext> contextProvider;
private final Provider<HgContext> contextProvider;
/** Field description */
private HgRepositoryHandler handler;
private final HgRepositoryHandler handler;
/** Field description */
private HookEventFacade hookEventFacade;
private final HookEventFacade hookEventFacade;
/** Field description */
private HgHookManager hookManager;
private final HgHookManager hookManager;
}