You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2013/01/15 14:12:03 UTC

svn commit: r1433390 [3/3] - in /httpcomponents: contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/ httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/ httpasyncclient/trunk/httpasyncclient/src/ma...

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java Tue Jan 15 13:12:01 2013
@@ -154,7 +154,9 @@ public class ChunkedOutputStream extends
         }
         this.cache[this.cachePosition] = (byte) b;
         this.cachePosition++;
-        if (this.cachePosition == this.cache.length) flushCache();
+        if (this.cachePosition == this.cache.length) {
+			flushCache();
+		}
     }
 
     /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java Tue Jan 15 13:12:01 2013
@@ -112,7 +112,9 @@ public class BasicHeaderElement implemen
 
     @Override
     public boolean equals(final Object object) {
-        if (this == object) return true;
+        if (this == object) {
+			return true;
+		}
         if (object instanceof HeaderElement) {
             BasicHeaderElement that = (BasicHeaderElement) object;
             return this.name.equals(that.name)

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java Tue Jan 15 13:12:01 2013
@@ -91,8 +91,9 @@ public class BasicHeaderIterator impleme
      *          or negative if there are no more headers
      */
     protected int findNext(int from) {
-        if (from < -1)
-            return -1;
+        if (from < -1) {
+			return -1;
+		}
 
         final int to = this.allHeaders.length-1;
         boolean found = false;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java Tue Jan 15 13:12:01 2013
@@ -89,8 +89,9 @@ public class BasicHeaderValueFormatter i
         String formatElements(final HeaderElement[] elems,
                               final boolean quote,
                               HeaderValueFormatter formatter) {
-        if (formatter == null)
-            formatter = BasicHeaderValueFormatter.INSTANCE;
+        if (formatter == null) {
+			formatter = BasicHeaderValueFormatter.INSTANCE;
+		}
         return formatter.formatElements(null, elems, quote).toString();
     }
 
@@ -126,8 +127,9 @@ public class BasicHeaderValueFormatter i
      * @return  a length estimate, in number of characters
      */
     protected int estimateElementsLen(final HeaderElement[] elems) {
-        if ((elems == null) || (elems.length < 1))
-            return 0;
+        if ((elems == null) || (elems.length < 1)) {
+			return 0;
+		}
 
         int result = (elems.length-1) * 2; // elements separated by ", "
         for (HeaderElement elem : elems) {
@@ -154,8 +156,9 @@ public class BasicHeaderValueFormatter i
         String formatHeaderElement(final HeaderElement elem,
                                    boolean quote,
                                    HeaderValueFormatter formatter) {
-        if (formatter == null)
-            formatter = BasicHeaderValueFormatter.INSTANCE;
+        if (formatter == null) {
+			formatter = BasicHeaderValueFormatter.INSTANCE;
+		}
         return formatter.formatHeaderElement(null, elem, quote).toString();
     }
 
@@ -199,8 +202,9 @@ public class BasicHeaderValueFormatter i
      * @return  a length estimate, in number of characters
      */
     protected int estimateHeaderElementLen(final HeaderElement elem) {
-        if (elem == null)
-            return 0;
+        if (elem == null) {
+			return 0;
+		}
 
         int result = elem.getName().length(); // name
         final String value = elem.getValue();
@@ -238,8 +242,9 @@ public class BasicHeaderValueFormatter i
         String formatParameters(final NameValuePair[] nvps,
                                 final boolean quote,
                                 HeaderValueFormatter formatter) {
-        if (formatter == null)
-            formatter = BasicHeaderValueFormatter.INSTANCE;
+        if (formatter == null) {
+			formatter = BasicHeaderValueFormatter.INSTANCE;
+		}
         return formatter.formatParameters(null, nvps, quote).toString();
     }
 
@@ -275,8 +280,9 @@ public class BasicHeaderValueFormatter i
      * @return  a length estimate, in number of characters
      */
     protected int estimateParametersLen(final NameValuePair[] nvps) {
-        if ((nvps == null) || (nvps.length < 1))
-            return 0;
+        if ((nvps == null) || (nvps.length < 1)) {
+			return 0;
+		}
 
         int result = (nvps.length-1) * 2; // "; " between the parameters
         for (NameValuePair nvp : nvps) {
@@ -302,8 +308,9 @@ public class BasicHeaderValueFormatter i
         String formatNameValuePair(final NameValuePair nvp,
                                    final boolean quote,
                                    HeaderValueFormatter formatter) {
-        if (formatter == null)
-            formatter = BasicHeaderValueFormatter.INSTANCE;
+        if (formatter == null) {
+			formatter = BasicHeaderValueFormatter.INSTANCE;
+		}
         return formatter.formatNameValuePair(null, nvp, quote).toString();
     }
 
@@ -339,8 +346,9 @@ public class BasicHeaderValueFormatter i
      * @return  a length estimate, in number of characters
      */
     protected int estimateNameValuePairLen(final NameValuePair nvp) {
-        if (nvp == null)
-            return 0;
+        if (nvp == null) {
+			return 0;
+		}
 
         int result = nvp.getName().length(); // name
         final String value = nvp.getValue();

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java Tue Jan 15 13:12:01 2013
@@ -85,8 +85,9 @@ public class BasicHeaderValueParser impl
         HeaderElement[] parseElements(final String value,
                                       HeaderValueParser parser) throws ParseException {
         Args.notNull(value, "Value");
-        if (parser == null)
-            parser = BasicHeaderValueParser.INSTANCE;
+        if (parser == null) {
+			parser = BasicHeaderValueParser.INSTANCE;
+		}
 
         CharArrayBuffer buffer = new CharArrayBuffer(value.length());
         buffer.append(value);
@@ -123,8 +124,9 @@ public class BasicHeaderValueParser impl
         HeaderElement parseHeaderElement(final String value,
                                          HeaderValueParser parser) throws ParseException {
         Args.notNull(value, "Value");
-        if (parser == null)
-            parser = BasicHeaderValueParser.INSTANCE;
+        if (parser == null) {
+			parser = BasicHeaderValueParser.INSTANCE;
+		}
 
         CharArrayBuffer buffer = new CharArrayBuffer(value.length());
         buffer.append(value);
@@ -176,8 +178,9 @@ public class BasicHeaderValueParser impl
         NameValuePair[] parseParameters(final String value,
                                         HeaderValueParser parser) throws ParseException {
         Args.notNull(value, "Value");
-        if (parser == null)
-            parser = BasicHeaderValueParser.INSTANCE;
+        if (parser == null) {
+			parser = BasicHeaderValueParser.INSTANCE;
+		}
 
         CharArrayBuffer buffer = new CharArrayBuffer(value.length());
         buffer.append(value);
@@ -233,8 +236,9 @@ public class BasicHeaderValueParser impl
        NameValuePair parseNameValuePair(final String value,
                                         HeaderValueParser parser) throws ParseException {
         Args.notNull(value, "Value");
-        if (parser == null)
-            parser = BasicHeaderValueParser.INSTANCE;
+        if (parser == null) {
+			parser = BasicHeaderValueParser.INSTANCE;
+		}
 
         CharArrayBuffer buffer = new CharArrayBuffer(value.length());
         buffer.append(value);

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java Tue Jan 15 13:12:01 2013
@@ -99,8 +99,9 @@ public class BasicLineFormatter implemen
     public final static
         String formatProtocolVersion(final ProtocolVersion version,
                                      LineFormatter formatter) {
-        if (formatter == null)
-            formatter = BasicLineFormatter.INSTANCE;
+        if (formatter == null) {
+			formatter = BasicLineFormatter.INSTANCE;
+		}
         return formatter.appendProtocolVersion(null, version).toString();
     }
 
@@ -154,8 +155,9 @@ public class BasicLineFormatter implemen
      */
     public final static String formatRequestLine(final RequestLine reqline,
                                                  LineFormatter formatter) {
-        if (formatter == null)
-            formatter = BasicLineFormatter.INSTANCE;
+        if (formatter == null) {
+			formatter = BasicLineFormatter.INSTANCE;
+		}
         return formatter.formatRequestLine(null, reqline).toString();
     }
 
@@ -210,8 +212,9 @@ public class BasicLineFormatter implemen
      */
     public final static String formatStatusLine(final StatusLine statline,
                                                 LineFormatter formatter) {
-        if (formatter == null)
-            formatter = BasicLineFormatter.INSTANCE;
+        if (formatter == null) {
+			formatter = BasicLineFormatter.INSTANCE;
+		}
         return formatter.formatStatusLine(null, statline).toString();
     }
 
@@ -268,8 +271,9 @@ public class BasicLineFormatter implemen
      */
     public final static String formatHeader(final Header header,
                                             LineFormatter formatter) {
-        if (formatter == null)
-            formatter = BasicLineFormatter.INSTANCE;
+        if (formatter == null) {
+			formatter = BasicLineFormatter.INSTANCE;
+		}
         return formatter.formatHeader(null, header).toString();
     }
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java Tue Jan 15 13:12:01 2013
@@ -106,8 +106,9 @@ public class BasicLineParser implements 
         ProtocolVersion parseProtocolVersion(String value,
                                              LineParser parser) throws ParseException {
         Args.notNull(value, "Value");
-        if (parser == null)
-            parser = BasicLineParser.INSTANCE;
+        if (parser == null) {
+			parser = BasicLineParser.INSTANCE;
+		}
 
         CharArrayBuffer buffer = new CharArrayBuffer(value.length());
         buffer.append(value);
@@ -216,7 +217,9 @@ public class BasicLineParser implements 
         final int  protolength = protoname.length();
 
         if (buffer.length() < protolength+4)
-            return false; // not long enough for "HTTP/1.1"
+		 {
+			return false; // not long enough for "HTTP/1.1"
+		}
 
         if (index < 0) {
             // end of line, no tolerance for trailing whitespace
@@ -231,8 +234,9 @@ public class BasicLineParser implements 
         } // else within line, don't tolerate whitespace
 
 
-        if (index + protolength + 4 > buffer.length())
-            return false;
+        if (index + protolength + 4 > buffer.length()) {
+			return false;
+		}
 
 
         // just check protocol name and slash, no need to analyse the version
@@ -253,8 +257,9 @@ public class BasicLineParser implements 
         RequestLine parseRequestLine(final String value,
                                      LineParser parser) throws ParseException {
         Args.notNull(value, "Value");
-        if (parser == null)
-            parser = BasicLineParser.INSTANCE;
+        if (parser == null) {
+			parser = BasicLineParser.INSTANCE;
+		}
 
         CharArrayBuffer buffer = new CharArrayBuffer(value.length());
         buffer.append(value);
@@ -341,8 +346,9 @@ public class BasicLineParser implements 
         StatusLine parseStatusLine(final String value,
                                    LineParser parser) throws ParseException {
         Args.notNull(value, "Value");
-        if (parser == null)
-            parser = BasicLineParser.INSTANCE;
+        if (parser == null) {
+			parser = BasicLineParser.INSTANCE;
+		}
 
         CharArrayBuffer buffer = new CharArrayBuffer(value.length());
         buffer.append(value);
@@ -426,8 +432,9 @@ public class BasicLineParser implements 
         Header parseHeader(final String value,
                            LineParser parser) throws ParseException {
         Args.notNull(value, "Value");
-        if (parser == null)
-            parser = BasicLineParser.INSTANCE;
+        if (parser == null) {
+			parser = BasicLineParser.INSTANCE;
+		}
 
         CharArrayBuffer buffer = new CharArrayBuffer(value.length());
         buffer.append(value);

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java Tue Jan 15 13:12:01 2013
@@ -100,8 +100,9 @@ public class BasicListHeaderIterator imp
      *          or negative if there are no more headers
      */
     protected int findNext(int from) {
-        if (from < -1)
-            return -1;
+        if (from < -1) {
+			return -1;
+		}
 
         final int to = this.allHeaders.size()-1;
         boolean found = false;
@@ -122,8 +123,9 @@ public class BasicListHeaderIterator imp
      *          iteration, <code>false</code> to skip
      */
     protected boolean filterHeader(int index) {
-        if (this.headerName == null)
-            return true;
+        if (this.headerName == null) {
+			return true;
+		}
 
         // non-header elements, including null, will trigger exceptions
         final String name = (this.allHeaders.get(index)).getName();

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java Tue Jan 15 13:12:01 2013
@@ -85,7 +85,9 @@ public class BasicNameValuePair implemen
 
     @Override
     public boolean equals(final Object object) {
-        if (this == object) return true;
+        if (this == object) {
+			return true;
+		}
         if (object instanceof NameValuePair) {
             BasicNameValuePair that = (BasicNameValuePair) object;
             return this.name.equals(that.name)

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java Tue Jan 15 13:12:01 2013
@@ -372,16 +372,19 @@ public class BasicTokenIterator implemen
     protected boolean isTokenChar(char ch) {
 
         // common sense extension of ALPHA + DIGIT
-        if (Character.isLetterOrDigit(ch))
-            return true;
+        if (Character.isLetterOrDigit(ch)) {
+			return true;
+		}
 
         // common sense extension of CTL
-        if (Character.isISOControl(ch))
-            return false;
+        if (Character.isISOControl(ch)) {
+			return false;
+		}
 
         // no common sense extension for this
-        if (isHttpSeparator(ch))
-            return false;
+        if (isHttpSeparator(ch)) {
+			return false;
+		}
 
         // RFC 2616, section 2.2 defines a token character as
         // "any CHAR except CTLs or separators". The controls

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/RouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/RouteSpecificPool.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/RouteSpecificPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/RouteSpecificPool.java Tue Jan 15 13:12:01 2013
@@ -144,8 +144,9 @@ abstract class RouteSpecificPool<T, C, E
     }
 
     public void unqueue(final PoolEntryFuture<E> future) {
-        if (future == null)
-            return;
+        if (future == null) {
+			return;
+		}
 
         this.pending.remove(future);
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java Tue Jan 15 13:12:01 2013
@@ -115,8 +115,9 @@ public final class BasicHttpProcessor im
     }
 
     public HttpRequestInterceptor getRequestInterceptor(int index) {
-        if ((index < 0) || (index >= this.requestInterceptors.size()))
-            return null;
+        if ((index < 0) || (index >= this.requestInterceptors.size())) {
+			return null;
+		}
         return this.requestInterceptors.get(index);
     }
 
@@ -144,8 +145,9 @@ public final class BasicHttpProcessor im
     }
 
     public HttpResponseInterceptor getResponseInterceptor(int index) {
-        if ((index < 0) || (index >= this.responseInterceptors.size()))
-            return null;
+        if ((index < 0) || (index >= this.responseInterceptors.size())) {
+			return null;
+		}
         return this.responseInterceptors.get(index);
     }
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java?rev=1433390&r1=1433389&r2=1433390&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java Tue Jan 15 13:12:01 2013
@@ -166,15 +166,18 @@ public class VersionInfo {
 
         // If version info is missing, a single "UNAVAILABLE" for the module
         // is sufficient. Everything else just clutters the output.
-        if (!UNAVAILABLE.equals(infoRelease))
-            sb.append(':').append(infoRelease);
-        if (!UNAVAILABLE.equals(infoTimestamp))
-            sb.append(':').append(infoTimestamp);
+        if (!UNAVAILABLE.equals(infoRelease)) {
+			sb.append(':').append(infoRelease);
+		}
+        if (!UNAVAILABLE.equals(infoTimestamp)) {
+			sb.append(':').append(infoTimestamp);
+		}
 
         sb.append(')');
 
-        if (!UNAVAILABLE.equals(infoClassloader))
-            sb.append('@').append(infoClassloader);
+        if (!UNAVAILABLE.equals(infoClassloader)) {
+			sb.append('@').append(infoClassloader);
+		}
 
         return sb.toString();
     }
@@ -196,8 +199,9 @@ public class VersionInfo {
         List<VersionInfo> vil = new ArrayList<VersionInfo>(pckgs.length);
         for (String pckg : pckgs) {
             VersionInfo vi = loadVersionInfo(pckg, clsldr);
-            if (vi != null)
-                vil.add(vi);
+            if (vi != null) {
+				vil.add(vi);
+			}
         }
 
         return vil.toArray(new VersionInfo[vil.size()]);
@@ -219,8 +223,9 @@ public class VersionInfo {
     public final static VersionInfo loadVersionInfo(final String pckg,
                                                     ClassLoader clsldr) {
         Args.notNull(pckg, "Package identifier");
-        if (clsldr == null)
-            clsldr = Thread.currentThread().getContextClassLoader();
+        if (clsldr == null) {
+			clsldr = Thread.currentThread().getContextClassLoader();
+		}
 
         Properties vip = null; // version info properties, if available
         try {
@@ -242,8 +247,9 @@ public class VersionInfo {
         }
 
         VersionInfo result = null;
-        if (vip != null)
-            result = fromMap(pckg, vip, clsldr);
+        if (vip != null) {
+			result = fromMap(pckg, vip, clsldr);
+		}
 
         return result;
     }
@@ -268,25 +274,29 @@ public class VersionInfo {
 
         if (info != null) {
             module = (String) info.get(PROPERTY_MODULE);
-            if ((module != null) && (module.length() < 1))
-                module = null;
+            if ((module != null) && (module.length() < 1)) {
+				module = null;
+			}
 
             release = (String) info.get(PROPERTY_RELEASE);
             if ((release != null) && ((release.length() < 1) ||
-                                      (release.equals("${pom.version}"))))
-                release = null;
+                                      (release.equals("${pom.version}")))) {
+				release = null;
+			}
 
             timestamp = (String) info.get(PROPERTY_TIMESTAMP);
             if ((timestamp != null) &&
                 ((timestamp.length() < 1) ||
                  (timestamp.equals("${mvn.timestamp}")))
-                )
-                timestamp = null;
+                ) {
+				timestamp = null;
+			}
         } // if info
 
         String clsldrstr = null;
-        if (clsldr != null)
-            clsldrstr = clsldr.toString();
+        if (clsldr != null) {
+			clsldrstr = clsldr.toString();
+		}
 
         return new VersionInfo(pckg, module, release, timestamp, clsldrstr);
     }