You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/03/13 21:46:02 UTC

[46/50] wicket git commit: WICKET-5819 Remove a check for null. It is definitely non-null at that point

WICKET-5819 Remove a check for null. It is definitely non-null at that point


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b53e750d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b53e750d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b53e750d

Branch: refs/heads/pr-86-media_tags
Commit: b53e750d530d263caf99516e4c21bd87a26f660f
Parents: c634d0a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 20 23:37:04 2015 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Thu Mar 12 22:13:06 2015 +0100

----------------------------------------------------------------------
 .../media/MediaStreamingResourceReference.java     | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/b53e750d/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaStreamingResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaStreamingResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaStreamingResourceReference.java
index ed6932b..94d60dc 100755
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaStreamingResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaStreamingResourceReference.java
@@ -169,17 +169,14 @@ public class MediaStreamingResourceReference extends PackageResourceReference
 				}
 				finally
 				{
-					if (resourceStream != null)
+					try
 					{
-						try
-						{
-							resourceStream.close();
-						}
-						catch (IOException e)
-						{
-							throw new WicketRuntimeException(
-								"A problem occurred while closing the video response stream.", e);
-						}
+						resourceStream.close();
+					}
+					catch (IOException e)
+					{
+						throw new WicketRuntimeException(
+							"A problem occurred while closing the video response stream.", e);
 					}
 				}
 			}