← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ant/utopic

« back to all changes in this revision

Viewing changes to src/main/org/apache/tools/ant/types/resources/ArchiveResource.java

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg
  • Date: 2014-05-09 11:46:04 UTC
  • mfrom: (25.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140509114604-3h26sbqgjef3jln4
Tags: 1.9.4-1
* New upstream release
  - Refreshed the patches
  - Removed the patch for #735786 (Fixed upstream)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/org/apache/tools/ant/types/resources/ArchiveResource.java
216
216
        if (isReference()) {
217
217
            return getCheckedRef().equals(another);
218
218
        }
219
 
        if (!(another.getClass().equals(getClass()))) {
 
219
        if (another == null || !(another.getClass().equals(getClass()))) {
220
220
            return false;
221
221
        }
222
222
        ArchiveResource r = (ArchiveResource) another;