diff options
Diffstat (limited to 'jack/src/com/android/jack/resource/ResourceImporter.java')
| -rw-r--r-- | jack/src/com/android/jack/resource/ResourceImporter.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/jack/src/com/android/jack/resource/ResourceImporter.java b/jack/src/com/android/jack/resource/ResourceImporter.java index 68e6f9b..d4a6d14 100644 --- a/jack/src/com/android/jack/resource/ResourceImporter.java +++ b/jack/src/com/android/jack/resource/ResourceImporter.java @@ -72,8 +72,7 @@ public class ResourceImporter extends ResourceOrMetaImporter { for (Resource existingResource : session.getResources()) { if (existingResource.getPath().equals(path)) { if (resourceCollisionPolicy == CollisionPolicy.FAIL) { - throw new ResourceImportConflictException(newResource.getLocation(), - existingResource.getLocation()); + throw new ResourceImportConflictException(existingResource, newResource.getLocation()); } else { session.getUserLogger().log(Level.INFO, "Resource in {0} has already been imported from {1}: ignoring import", new Object[] { |