You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/11/21 04:27:12 UTC
[2/4] incubator-brooklyn git commit: Simplify ResourceUtils argument
check
Simplify ResourceUtils argument check
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ade3e415
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ade3e415
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ade3e415
Branch: refs/heads/master
Commit: ade3e415f5c3816701bce9aee17a12d668cf5010
Parents: c06c23d
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri Nov 20 18:15:00 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Nov 20 18:15:00 2015 +0000
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/util/core/ResourceUtils.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ade3e415/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java b/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
index d19592f..aac7f7b 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
@@ -220,8 +220,7 @@ public class ResourceUtils {
*/
public InputStream getResourceFromUrl(String url) {
try {
- if (url==null) throw new NullPointerException("Cannot read from null");
- if (url=="") throw new NullPointerException("Cannot read from empty string");
+ if (Strings.isBlank(url)) throw new IllegalArgumentException("Cannot read from empty string");
String orig = url;
String protocol = Urls.getProtocol(url);
if (protocol!=null) {