Repository: incubator-juneau
Updated Branches:
  refs/heads/master e0fe84b4d -> 36dbf821c


FindBugs issues

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/36dbf821
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/36dbf821
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/36dbf821

Branch: refs/heads/master
Commit: 36dbf821ccff9f12d41a28c66c2b3a76d172c0f8
Parents: e0fe84b
Author: jamesbognar <jamesbog...@gmail.com>
Authored: Mon Sep 19 10:14:30 2016 -0400
Committer: jamesbognar <jamesbog...@gmail.com>
Committed: Mon Sep 19 10:14:30 2016 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/juneau/internal/Version.java     | 2 +-
 .../java/org/apache/juneau/serializer/SerializerSession.java  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/36dbf821/juneau-core/src/main/java/org/apache/juneau/internal/Version.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/Version.java 
b/juneau-core/src/main/java/org/apache/juneau/internal/Version.java
index c7eb8bf..365e161 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/Version.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/Version.java
@@ -121,7 +121,7 @@ public class Version {
         * @param v The version to compare to.
         * @return <jk>true</jk> if the specified version is equal to this 
version.
         */
-       public boolean equals(Version v) {
+       public boolean isEqualsTo(Version v) {
                for (int i = 0; i < Math.min(parts.length, v.parts.length); i++)
                        if (v.parts[i] - parts[i] != 0)
                                return false;

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/36dbf821/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
----------------------------------------------------------------------
diff --git 
a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java 
b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 7821542..6f10f0a 100644
--- 
a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++ 
b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -621,7 +621,12 @@ public class SerializerSession extends Session {
        public String resolveUri(String uri) {
                if (uri.indexOf("://") != -1 || (absolutePathUriBase == null && 
relativeUriBase == null))
                        return uri;
-               StringBuilder sb = new StringBuilder(uri.length() + 
absolutePathUriBase.length() + 1 + relativeUriBase.length());
+               StringBuilder sb = new StringBuilder(
+                       uri.length()
+                       + (absolutePathUriBase == null ? 0 : 
absolutePathUriBase.length())
+                       + 1
+                       + (relativeUriBase == null ? 0 : 
relativeUriBase.length())
+               );
                if (StringUtils.startsWith(uri, '/')) {
                        if (absolutePathUriBase != null)
                                sb.append(absolutePathUriBase);

Reply via email to