diff options
Diffstat (limited to 'java/security/IntersectingDomainCombiner.java')
| -rw-r--r-- | java/security/IntersectingDomainCombiner.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/java/security/IntersectingDomainCombiner.java b/java/security/IntersectingDomainCombiner.java index 2bfcfb442..9a40ce75e 100644 --- a/java/security/IntersectingDomainCombiner.java +++ b/java/security/IntersectingDomainCombiner.java @@ -1,5 +1,5 @@ /* IntersectingDomainCombiner.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2014 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,7 +65,7 @@ final class IntersectingDomainCombiner implements DomainCombiner public ProtectionDomain[] combine (ProtectionDomain[] currentDomains, ProtectionDomain[] assignedDomains) { - HashSet newDomains = new HashSet (); + HashSet<ProtectionDomain> newDomains = new HashSet<ProtectionDomain>(); for (int i = 0; i < currentDomains.length; i++) { if (currentDomains[i] == null) @@ -76,7 +76,6 @@ final class IntersectingDomainCombiner implements DomainCombiner newDomains.add (currentDomains[i]); } } - return (ProtectionDomain[]) - newDomains.toArray(new ProtectionDomain[newDomains.size()]); + return newDomains.toArray(new ProtectionDomain[newDomains.size()]); } } |