You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ja...@apache.org on 2008/07/30 01:34:51 UTC
svn commit: r680881 -
/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
Author: janb
Date: Tue Jul 29 16:34:51 2008
New Revision: 680881
URL: http://svn.apache.org/viewvc?rev=680881&view=rev
Log:
Insert some null protection in case we are not passed any Server objects.
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java?rev=680881&r1=680880&r2=680881&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java Tue Jul 29 16:34:51 2008
@@ -280,6 +280,9 @@
return null;
URL bindingURL = new URL(binding.getRemoteUrl());
+ if (_servers == null)
+ return null;
+
Iterator<Server> itor = _servers.iterator();
Server server = null;
while(itor.hasNext() && server==null)
@@ -297,10 +300,13 @@
private Set<StreamObserver> createStreamObservers (Server server)
{
HashSet<StreamObserver> observers = new HashSet<StreamObserver>();
- Set<StreamObserverFactory> factories = server.getStreamObserverFactories();
- for (StreamObserverFactory f:factories)
+ if (server != null)
{
- observers.add(f.newInstance());
+ Set<StreamObserverFactory> factories = server.getStreamObserverFactories();
+ for (StreamObserverFactory f:factories)
+ {
+ observers.add(f.newInstance());
+ }
}
return observers;
}