Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

fix possible npes

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-10-29 16:23:43 +01:00
parent 28b8e2c13e
commit 58b5c1130c
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyFilter.java
View File

@@ -35,6 +35,8 @@ package sonia.scm.plugin;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import com.google.common.io.Closeables;
import org.sonatype.aether.artifact.Artifact; import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.graph.DependencyFilter; import org.sonatype.aether.graph.DependencyFilter;
import org.sonatype.aether.graph.DependencyNode; import org.sonatype.aether.graph.DependencyNode;
@@ -109,7 +111,7 @@ public class AetherDependencyFilter implements DependencyFilter
try try
{ {
scanner = new Scanner( scanner = new Scanner(
AetherDependencyFilter.class.getResourceAsStream(EXCLUDE_LIST)); AetherDependencyFilter.class.getResourceAsStream(EXCLUDE_LIST));
while (scanner.hasNextLine()) while (scanner.hasNextLine())
{ {
@@ -118,7 +120,7 @@ public class AetherDependencyFilter implements DependencyFilter
} }
finally finally
{ {
scanner.close(); Closeables.closeQuietly(scanner);
} }
} }

17
scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java
View File

@@ -29,10 +29,13 @@
* *
*/ */
package sonia.scm.util; package sonia.scm.util;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import com.google.common.io.Closeables;
import com.google.inject.Singleton; import com.google.inject.Singleton;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
@@ -74,7 +77,7 @@ public class DebugServlet extends HttpServlet
*/ */
@Override @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException throws ServletException, IOException
{ {
processRequest(request, response); processRequest(request, response);
} }
@@ -91,8 +94,8 @@ public class DebugServlet extends HttpServlet
*/ */
@Override @Override
protected void doPost(HttpServletRequest request, protected void doPost(HttpServletRequest request,
HttpServletResponse response) HttpServletResponse response)
throws ServletException, IOException throws ServletException, IOException
{ {
processRequest(request, response); processRequest(request, response);
} }
@@ -160,7 +163,7 @@ public class DebugServlet extends HttpServlet
* @param session * @param session
*/ */
private void appendSessionAttributes(PrintWriter writer, private void appendSessionAttributes(PrintWriter writer,
final HttpSession session) final HttpSession session)
{ {
writer.append("<h2>Session Attributes</h2>"); writer.append("<h2>Session Attributes</h2>");
appendAttributes(writer, new AttributeContext() appendAttributes(writer, new AttributeContext()
@@ -213,8 +216,8 @@ public class DebugServlet extends HttpServlet
* @throws ServletException * @throws ServletException
*/ */
private void processRequest(HttpServletRequest request, private void processRequest(HttpServletRequest request,
HttpServletResponse response) HttpServletResponse response)
throws ServletException, IOException throws ServletException, IOException
{ {
PrintWriter writer = null; PrintWriter writer = null;
@@ -232,7 +235,7 @@ public class DebugServlet extends HttpServlet
} }
finally finally
{ {
writer.close(); Closeables.closeQuietly(writer);
} }
} }