svn commit: r1005392 - /incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs

[apadilla]

Author: apadilla
Date: Thu Oct  7 10:09:11 2010
New Revision: 1005392

URL: http://svn.apache.org/viewvc?rev=1005392&view=rev
Log:
https://issues.apache.org/jira/browse/NPANDAY-288 - revised loading of assembly 
to fix FileLoadException in 64bit

Modified:
    
incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs

Modified: 
incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
URL: 
http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs?rev=1005392&r1=1005391&r2=1005392&view=diff
==============================================================================
--- 
incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
 (original)
+++ 
incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
 Thu Oct  7 10:09:11 2010
@@ -760,9 +760,10 @@ namespace NPanday.ProjectImporter.Conver
                 
                 refDependency.version = reference.Version ?? "1.0.0.0";
                 
-                System.Reflection.Assembly a = 
System.Reflection.Assembly.Load(gacUtil.GetAssemblyInfo(reference.Name));
-
-                if (reference.PublicKeyToken != null)
+                               //exclude ProcessArchitecture when loading 
assembly on a non-32 bit machine
+                System.Reflection.Assembly a = 
System.Reflection.Assembly.Load(new 
System.Reflection.AssemblyName(gacUtil.GetAssemblyInfo(reference.Name)).FullName);
+                
+                               if (reference.PublicKeyToken != null)
                 {
                     refDependency.classifier = reference.PublicKeyToken;
                 }