Index: modules/security/test/common/unit/javax/security/auth/SubjectDomainCombinerTest.java =================================================================== --- modules/security/test/common/unit/javax/security/auth/SubjectDomainCombinerTest.java (revision 387456) +++ modules/security/test/common/unit/javax/security/auth/SubjectDomainCombinerTest.java (working copy) @@ -56,15 +56,14 @@ assertTrue("Subject is not null", subject == combiner.getSubject()); + } + + public final void testSubjectDomainCombinerNPE() { try { - combiner = new SubjectDomainCombiner(null); + SubjectDomainCombiner combiner = new SubjectDomainCombiner(null); + fail("Constructor should throw NullPointerException"); } catch (NullPointerException e) { - if(!testing){ - throw e; - } - return; } - assertNull("Subject is null", combiner.getSubject()); } /** Index: modules/security/src/common/javasrc/javax/security/auth/SubjectDomainCombiner.java =================================================================== --- modules/security/src/common/javasrc/javax/security/auth/SubjectDomainCombiner.java (revision 387456) +++ modules/security/src/common/javasrc/javax/security/auth/SubjectDomainCombiner.java (working copy) @@ -44,6 +44,8 @@ * @com.intel.drl.spec_ref */ public SubjectDomainCombiner(Subject subject) { + if (subject == null) + throw new NullPointerException(); this.subject = subject; }