cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet CocoonPortlet.java

[vgritsenko]

vgritsenko    2004/06/23 12:48:04

  Modified:    src/blocks/portal/java/org/apache/cocoon/portlet
                        CocoonPortlet.java
  Log:
  Sync CocoonServlet and CocoonPortlet
  
  Revision  Changes    Path
  1.8       +13 -9     
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java
  
  Index: CocoonPortlet.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CocoonPortlet.java        22 Jun 2004 20:41:08 -0000      1.7
  +++ CocoonPortlet.java        23 Jun 2004 19:48:04 -0000      1.8
  @@ -102,7 +102,7 @@
       // Used by "show-time"
       static final float SECOND = 1000;
       static final float MINUTE = 60 * SECOND;
  -    static final float HOUR = 60 * MINUTE;
  +    static final float HOUR   = 60 * MINUTE;
   
       private Logger log;
       private LoggerManager loggerManager;
  @@ -470,8 +470,8 @@
   
           this.containerEncoding = getInitParameter("container-encoding", 
"ISO-8859-1");
           this.defaultFormEncoding = getInitParameter("form-encoding", 
"ISO-8859-1");
  -
           this.appContext.put(Constants.CONTEXT_DEFAULT_ENCODING, 
this.defaultFormEncoding);
  +
           this.manageExceptions = 
getInitParameterAsBoolean("manage-exceptions", true);
   
           this.enableInstrumentation = 
getInitParameterAsBoolean("enable-instrumentation", false);
  @@ -632,10 +632,10 @@
           }
   
           buildClassPath.append(File.pathSeparatorChar)
  -                .append(System.getProperty("java.class.path"));
  +                      .append(System.getProperty("java.class.path"));
   
           buildClassPath.append(File.pathSeparatorChar)
  -                .append(getExtraClassPath());
  +                      .append(getExtraClassPath());
           return buildClassPath.toString();
       }
   
  @@ -788,7 +788,7 @@
        * file.
        */
       protected void initLogger() {
  -        String logLevel = getInitParameter("log-level", "INFO");
  +        final String logLevel = getInitParameter("log-level", "INFO");
   
           final String accesslogger = getInitParameter("servlet-logger");
   
  @@ -857,7 +857,8 @@
        *
        * @throws PortletException
        */
  -    private URL getConfigFile(final String configFileName) throws 
PortletException {
  +    private URL getConfigFile(final String configFileName)
  +    throws PortletException {
           final String usedFileName;
   
           if (configFileName == null) {
  @@ -889,7 +890,7 @@
   
           if (result == null) {
               File resultFile = new File(usedFileName);
  -            if (resultFile.isFile())
  +            if (resultFile.isFile()) {
                   try {
                       result = resultFile.getCanonicalFile().toURL();
                   } catch (Exception e) {
  @@ -897,6 +898,7 @@
                       getLogger().error(msg, e);
                       throw new PortletException(msg, e);
                   }
  +            }
           }
   
           if (result == null) {
  @@ -1445,8 +1447,10 @@
        * @return the parent component manager, or <code>null</code>.
        */
       protected synchronized ComponentManager getParentComponentManager() {
  -        if (parentComponentManager != null && parentComponentManager 
instanceof Disposable)
  +        if (parentComponentManager != null && parentComponentManager 
instanceof Disposable) {
               ((Disposable) parentComponentManager).dispose();
  +        }
  +        
           parentComponentManager = null;
           if (parentComponentManagerClass != null) {
               try {