svn commit: r1619665 - in /incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver: NPandayResolutionCache.java resolvers/PdbAssemblyResolver.java

[brett]

Author: brett
Date: Fri Aug 22 05:14:26 2014
New Revision: 1619665

URL: http://svn.apache.org/r1619665
Log:
[NPANDAY-599] line up keys properly

Caching wasn't taking because wrong ID was being used (and PDB using the wrong 
artifact)

Modified:
    
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver/NPandayResolutionCache.java
    
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver/resolvers/PdbAssemblyResolver.java

Modified: 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver/NPandayResolutionCache.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver/NPandayResolutionCache.java?rev=1619665&r1=1619664&r2=1619665&view=diff
==============================================================================
--- 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver/NPandayResolutionCache.java
 (original)
+++ 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver/NPandayResolutionCache.java
 Fri Aug 22 05:14:26 2014
@@ -44,7 +44,7 @@ public class NPandayResolutionCache
     }
 
     public Boolean applyTo(Artifact artifact){
-        String key = artifact.getArtifactId();
+        String key = artifact.getId();
         if (cache.containsKey(key)){
            File resolvedFile = cache.get(key);
            if (resolvedFile != null){

Modified: 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver/resolvers/PdbAssemblyResolver.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver/resolvers/PdbAssemblyResolver.java?rev=1619665&r1=1619664&r2=1619665&view=diff
==============================================================================
--- 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver/resolvers/PdbAssemblyResolver.java
 (original)
+++ 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/resolver/resolvers/PdbAssemblyResolver.java
 Fri Aug 22 05:14:26 2014
@@ -96,7 +96,7 @@ public class PdbAssemblyResolver extends
                 throw new ArtifactNotFoundException(e.getMessage(), artifact);
             }
 
-            cache.put(artifact);
+            cache.put(pdbArtifact);
         }
         if (pdbArtifact.isResolved()){
             additionalDependenciesCollector.add(pdbArtifact);