felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r961446 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Date Wed, 07 Jul 2010 18:03:15 GMT
Author: rickhall
Date: Wed Jul  7 18:03:14 2010
New Revision: 961446

URL: http://svn.apache.org/viewvc?rev=961446&view=rev
Log:
Log resolve error rather than print to stdout. (FELIX-2451)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java?rev=961446&r1=961445&r2=961446&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Wed Jul  7 18:03:14 2010
@@ -111,7 +111,10 @@ public class ResolverImpl implements Res
                     catch (ResolveException ex)
                     {
                         rethrow = ex;
-                        System.out.println("RE: " + ex);
+                        m_logger.log(
+                            Logger.LOG_DEBUG,
+                            "Current candidate permutation failed, will try another if possible.",
+                            ex);
                     }
                 }
                 while ((rethrow != null)
@@ -188,7 +191,10 @@ public class ResolverImpl implements Res
                     catch (ResolveException ex)
                     {
                         rethrow = ex;
-                        System.out.println("RE: " + ex);
+                        m_logger.log(
+                            Logger.LOG_DEBUG,
+                            "Current candidate permutation failed, will try another if possible.",
+                            ex);
                     }
                 }
                 while ((rethrow != null)
@@ -1356,7 +1362,7 @@ public class ResolverImpl implements Res
                 Set<Capability> candidates = candidateMap.get(req);
                 if ((candidates != null) && (candidates.size() > 0))
                 {
-                        System.out.println("    " + req + ": " + candidates);
+                    System.out.println("    " + req + ": " + candidates);
                 }
             }
             for (Requirement req : module.getDynamicRequirements())



Mime
View raw message