cvs commit: jahia/src/java/org/jahia/blogs BloggerAPIImpl.java MetaWeblogAPIImpl.java

[Xavier Lawrence]

xlawrence    2005/04/21 10:23:08 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/java/org/jahia/blogs BloggerAPIImpl.java 
                             MetaWeblogAPIImpl.java 
  Log:
  Updated to support MovableType
  
  Revision  Changes    Path
  1.1.2.3   +17 -0     jahia/src/java/org/jahia/blogs/BloggerAPIImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/BloggerAPIImpl.java.diff?r1=1.1.2.2&r2=1.1.2.3&f=h
  1.1.2.4   +17 -1     jahia/src/java/org/jahia/blogs/MetaWeblogAPIImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/MetaWeblogAPIImpl.java.diff?r1=1.1.2.3&r2=1.1.2.4&f=h
  
  
  
  Index: BloggerAPIImpl.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/blogs/Attic/BloggerAPIImpl.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- BloggerAPIImpl.java       14 Apr 2005 16:01:46 -0000      1.1.2.2
  +++ BloggerAPIImpl.java       21 Apr 2005 08:23:08 -0000      1.1.2.3
  @@ -78,6 +78,7 @@
           
           try {
               return (String)action.execute();
  +            
           } catch (Exception e) {
               e.printStackTrace();
               if (e.getMessage().indexOf("Login") != -1) {
  @@ -86,6 +87,9 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +            
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -102,6 +106,7 @@
           
           try {
               return ((Boolean)action.execute()).booleanValue();
  +            
           } catch (Exception e) {
               e.printStackTrace();
               if (e.getMessage().indexOf("Login") != -1) {
  @@ -110,6 +115,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -133,6 +140,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -157,6 +166,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -181,6 +192,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -231,6 +244,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -253,6 +268,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
   }
  
  
  
  Index: MetaWeblogAPIImpl.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/blogs/Attic/MetaWeblogAPIImpl.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- MetaWeblogAPIImpl.java    15 Apr 2005 07:44:18 -0000      1.1.2.3
  +++ MetaWeblogAPIImpl.java    21 Apr 2005 08:23:08 -0000      1.1.2.4
  @@ -87,6 +87,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -110,6 +112,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -133,6 +137,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -157,6 +163,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -184,6 +192,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -207,6 +217,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -218,7 +230,7 @@
                   password);
           
           AbstractAction action = new GetCategoriesAction(blogID, userName,
  -                password);
  +                password, true);
           
           try {
               return (Hashtable)action.execute();
  @@ -230,6 +242,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
       
  @@ -253,6 +267,8 @@
               } else {
                   throw new XmlRpcException(UNKNOWN_EXCEPTION, e.getMessage());
               }
  +        } finally {
  +            action = null;
           }
       }
   }