Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

Conflicts:
	source/net/yacy/peers/Protocol.java

source/net/yacy/peers/Protocol.java

@@ -505,7 +505,7 @@ public final class Protocol {
         event.addExpectedRemoteReferences(count);
         SearchResult result = null;
         for (String ip: target.getIPs()) {
-            if (ip.indexOf(':') >= 0) System.out.println("Search target: IPv6: " + ip);
+            //if (ip.indexOf(':') >= 0) System.out.println("Search target: IPv6: " + ip);
             String clusteraddress = target.getPublicAddress(ip);
             if (target.clash(event.peers.mySeed().getIPs())) clusteraddress = "localhost:" + event.peers.mySeed().getPort();
             try {
@@ -531,6 +531,7 @@ public final class Protocol {
                 event.peers.peerActions.interfaceDeparture(target, ip);
                 return -1;
             }
+
         }
         // computation time
         final long totalrequesttime = System.currentTimeMillis() - timestamp;

source/net/yacy/peers/SeedDB.java

@@ -966,6 +966,7 @@ public final class SeedDB implements AlternativeDomainNames {
         }
     }
 
+    @Deprecated
     public String targetAddress(final String targetHash) {
         // find target address
         String address;
@@ -980,6 +981,19 @@ public final class SeedDB implements AlternativeDomainNames {
         return address;
     }
     
+    public Set<String> targetIPs(final String targetHash) {
+        // find target address
+        Set<String> ips;
+        if (targetHash.equals(mySeed().hash)) {
+            ips = mySeed().getIPs();
+        } else {
+            final Seed targetSeed = getConnected(targetHash);
+            if (targetSeed == null) { return null; }
+            ips = targetSeed.getIPs();
+        }
+        return ips;
+    }
+
     private class seedEnum implements Iterator<Seed> {
 
         private Iterator<Map.Entry<byte[], Map<String, String>>> it;

source/net/yacy/search/schema/CollectionConfiguration.java

@@ -1267,9 +1267,9 @@ public class CollectionConfiguration extends SchemaConfiguration implements Seri
                                 Collection<Object> proctags = doc.getFieldValues(CollectionSchema.process_sxt.getSolrFieldName());
                                 final String u = (String) doc.getFieldValue(CollectionSchema.sku.getSolrFieldName());
                                 final String i = (String) doc.getFieldValue(CollectionSchema.id.getSolrFieldName());
-                                if (proctags == null) {
+                                if (proctags == null || proctags.size() == 0) {
                                     // this should not happen since we collected the documents using a process_sxt:[* TO *] term
-                                    ConcurrentLog.warn("CollectionConfiguration", "no process_sxt entry for url " + u);
+                                    ConcurrentLog.warn("CollectionConfiguration", "no process_sxt entry for url " + u + ", id=" + i);
                                     continue;
                                 }
                                 try {