Home | History | Annotate | Download | only in patch
      1 diff -ur ../../src-unpatched/trunk/org/apache/harmony/javax/security/auth/login/LoginContext.java ./org/apache/harmony/javax/security/auth/login/LoginContext.java
      2 --- ../../src-unpatched/trunk/org/apache/harmony/javax/security/auth/login/LoginContext.java	2009-12-06 15:31:24.000000000 +0100
      3 +++ ./org/apache/harmony/javax/security/auth/login/LoginContext.java	2009-12-06 15:36:20.000000000 +0100
      4 @@ -161,7 +161,7 @@
      5              }
      6              entries = config.getAppConfigurationEntry("other"); //$NON-NLS-1$
      7              if (entries == null) {
      8 -                throw new LoginException(Messages.getString("auth.35", name)); //$NON-NLS-1$
      9 +                throw new LoginException("auth.35 " + name); //$NON-NLS-1$
     10              }
     11          }
     12  
     13 @@ -524,8 +524,8 @@
     14                  try {
     15                      klass = Class.forName(klassName, false, contextClassLoader);
     16                  } catch (ClassNotFoundException ex) {
     17 -                    throw (LoginException) new LoginException(Messages.getString(
     18 -                            "auth.39", klassName)).initCause(ex); //$NON-NLS-1$
     19 +                    throw (LoginException) new LoginException(
     20 +                            "auth.39 " + klassName).initCause(ex); //$NON-NLS-1$
     21                  }
     22              }
     23  
     24 @@ -533,12 +533,12 @@
     25                  try {
     26                      module = (LoginModule) klass.newInstance();
     27                  } catch (IllegalAccessException ex) {
     28 -                    throw (LoginException) new LoginException(Messages.getString(
     29 -                            "auth.3A", klassName)) //$NON-NLS-1$
     30 +                    throw (LoginException) new LoginException(
     31 +                            "auth.3A " + klassName) //$NON-NLS-1$
     32                              .initCause(ex);
     33                  } catch (InstantiationException ex) {
     34 -                    throw (LoginException) new LoginException(Messages.getString(
     35 -                            "auth.3A", klassName)) //$NON-NLS-1$
     36 +                    throw (LoginException) new LoginException(
     37 +                            "auth.3A" + klassName) //$NON-NLS-1$
     38                              .initCause(ex);
     39                  }
     40                  module.initialize(subject, callbackHandler, sharedState, entry.getOptions());
     41 diff -ur ../../src-unpatched/trunk/org/apache/harmony/javax/security/auth/Subject.java ./org/apache/harmony/javax/security/auth/Subject.java
     42 --- ../../src-unpatched/trunk/org/apache/harmony/javax/security/auth/Subject.java	2009-12-06 15:31:24.000000000 +0100
     43 +++ ./org/apache/harmony/javax/security/auth/Subject.java	2009-12-06 15:32:10.000000000 +0100
     44 @@ -669,7 +669,7 @@
     45  
     46                      if (!c.isAssignableFrom(o.getClass())) {
     47                          throw new IllegalArgumentException(
     48 -                                Messages.getString("auth.0C", c.getName())); //$NON-NLS-1$
     49 +                                "auth.0C " + c.getName()); //$NON-NLS-1$
     50                      }
     51  
     52                      if (elements.contains(o)) {
     53 @@ -779,4 +779,4 @@
     54              }
     55          }
     56      }
     57 -}
     58 \ No newline at end of file
     59 +}
     60