Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv9074
Modified Files:
CloudUtil.java CloudThreadLocal.java
Log Message:
code conventions only
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
Index: CloudUtil.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/util/CloudUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CloudUtil.java 17 Jul 2008 17:16:36 -0000 1.2
+++ CloudUtil.java 12 Aug 2008 19:48:55 -0000 1.3
@@ -23,7 +23,7 @@
/**
* An utility to work with clouds on the session or as a ThreadLocal
* @since MMBase-1.9
- * @version $Id: CloudUtil.java,v 1.2 2008/07/17 17:16:36 michiel Exp $
+ * @version $Id: CloudUtil.java,v 1.3 2008/08/12 19:48:55 michiel Exp $
*/
public class CloudUtil {
@@ -31,8 +31,7 @@
public static final String DEFAULT_CLOUD_NAME = "mmbase";
public static final String DEFAULT_AUTHENTICATION = "name/password";
- /** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(CloudUtil.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(CloudUtil.class);
private CloudUtil() {
//Utility
@@ -103,8 +102,7 @@
HttpSession session = req.getSession();
if (session != null) {
session.setAttribute(sessionname, cloud);
- }
- else {
+ } else {
log.warn("Could not get or create a session to put the cloud on.");
}
return cloud;
Index: CloudThreadLocal.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/util/CloudThreadLocal.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CloudThreadLocal.java 9 Aug 2008 09:48:43 -0000 1.3
+++ CloudThreadLocal.java 12 Aug 2008 19:48:55 -0000 1.4
@@ -16,7 +16,7 @@
/**
* ThreadLocal to store an MMBase Bridge Cloud
* @since MMBase-1.9
- * @version $Id: CloudThreadLocal.java,v 1.3 2008/08/09 09:48:43 michiel Exp $
+ * @version $Id: CloudThreadLocal.java,v 1.4 2008/08/12 19:48:55 michiel Exp $
*/
public class CloudThreadLocal {
@@ -38,8 +38,8 @@
*/
public static void bind(Cloud cloud) {
cleanupAnyOrphanedCloud();
- if ( cloud != null ) {
- context.set( cloud );
+ if (cloud != null) {
+ context.set(cloud);
}
}
@@ -50,16 +50,16 @@
*/
public static Cloud unbind() {
Cloud cloud = context.get();
- if ( cloud != null ) {
- context.set( null );
+ if (cloud != null) {
+ context.set(null);
}
return cloud;
}
private static void cleanupAnyOrphanedCloud() {
Cloud orphan = unbind();
- if ( orphan != null ) {
- log.warn( "Already cloud bound on call to bind(); make sure you
clean up your cloud!" );
+ if (orphan != null) {
+ log.warn("Already cloud bound on call to bind(); make sure you
clean up your cloud!");
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs