MONDRIAN: fixes to checkStyle code formatting errors

[git-p4: depot-paths = "//open/mondrian/": change = 14568]
pentaho · Aug 26, 2011 · 9d51a44 · 9d51a44
1 parent 514225c
commit 9d51a44
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/src/main/mondrian/xmla/impl/DefaultXmlaServlet.java b/src/main/mondrian/xmla/impl/DefaultXmlaServlet.java
@@ -342,8 +342,8 @@ protected void handleSoapHeader(
                     if (sessionInfo != null) {
                         context.put(CONTEXT_XMLA_USERNAME, sessionInfo.user);
                         context.put(
-                        		CONTEXT_XMLA_PASSWORD,
-                        		sessionInfo.password);
+                            CONTEXT_XMLA_PASSWORD,
+                            sessionInfo.password);
                     }
 
                     context.put(CONTEXT_XMLA_SESSION_ID, sessionIdStr);
@@ -423,7 +423,6 @@ protected void handleSoapHeader(
 
 
     protected String generateSessionId(Map<String, Object> context) {
-
         for (XmlaRequestCallback callback : getCallbacks()) {
             final String sessionId = callback.generateSessionId(context);
             if (sessionId != null) {
@@ -434,13 +433,13 @@ protected String generateSessionId(Map<String, Object> context) {
 
         // Generate a pseudo-random new session ID.
         return Long.toString(17L * System.nanoTime()
-        		+
-        		3L * System.currentTimeMillis(), 35);
+                +
+                3L * System.currentTimeMillis(), 35);
     }
 
 
     private static String getSessionIdFromRequest(Element e,
-    		Map<String, Object> context)
+            Map<String, Object> context)
         throws Exception
     {
         // extract the SessionId attrs value and put into context
@@ -826,15 +825,14 @@ private SessionInfo getSessionInfo(String sessionId) {
 
         if (sessionInfo == null) {
             LOGGER.error(
-            		"No login credentials for found for session ["
-            		+
-                    sessionId + "]");
+                "No login credentials for found for session ["+
+                sessionId + "]");
         } else {
             LOGGER.debug(
-            		"Found credentials for session id ["
-            		+ sessionId
-            		+ "], username=[" + sessionInfo.user
-                    + "] in servlet cache");
+                "Found credentials for session id ["
+                + sessionId
+                + "], username=[" + sessionInfo.user
+                + "] in servlet cache");
         }
         return sessionInfo;
     }

diff --git a/src/main/mondrian/xmla/impl/Olap4jXmlaServlet.java b/src/main/mondrian/xmla/impl/Olap4jXmlaServlet.java
@@ -26,7 +26,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.lang.reflect.UndeclaredThrowableException;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.*;
@@ -414,17 +413,15 @@ private static OlapConnection createDelegatingOlapConnection(
             olapConnection.getClass().getClassLoader(),
             new Class[] {OlapConnection.class},
             new InvocationHandler() {
-
                 public Object invoke(
                     Object proxy,
                     Method method,
                     Object[] args)
                     throws Throwable
                 {
                     if ("unwrap".equals(method.getName())
-                    		||
-                            OlapConnection.class.isAssignableFrom(
-                                    method.getDeclaringClass()))
+                        || OlapConnection.class
+                        .isAssignableFrom(method.getDeclaringClass()))
                     {
                         return method.invoke(olapConnection, args);
                     } else {