trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arvi...@apache.org
Subject [1/2] incubator-trafodion git commit: Update fix for TRAFODION-1814
Date Tue, 16 Feb 2016 19:19:05 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master d25090b17 -> 6f26a0a03


Update fix for TRAFODION-1814


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/53b8f22d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/53b8f22d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/53b8f22d

Branch: refs/heads/master
Commit: 53b8f22d760f138b3e4fcd012d02b2e314b8c213
Parents: fab414d
Author: venkat1m <venkat.muthuswamy@esgyn.com>
Authored: Fri Feb 12 23:52:04 2016 +0000
Committer: venkat1m <venkat.muthuswamy@esgyn.com>
Committed: Fri Feb 12 23:52:04 2016 +0000

----------------------------------------------------------------------
 .../java/org/trafodion/rest/ServerResource.java | 37 +++++---------------
 .../org/trafodion/rest/VersionResource.java     | 25 +++----------
 2 files changed, 13 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/53b8f22d/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/ServerResource.java b/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
index 0dd623a..2e2de8a 100644
--- a/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
@@ -57,28 +57,6 @@ public class ServerResource extends ResourceBase {
 		cacheControl.setNoTransform(false);
 	}
 
-	/**
-* @@@ START COPYRIGHT @@@
-
-	Licensed to the Apache Software Foundation (ASF) under one
-	or more contributor license agreements.  See the NOTICE file
-	distributed with this work for additional information
-	regarding copyright ownership.  The ASF licenses this file
-	to you under the Apache License, Version 2.0 (the
-	"License"); you may not use this file except in compliance
-	with the License.  You may obtain a copy of the License at
-
-	  http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing,
-	software distributed under the License is distributed on an
-	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	KIND, either express or implied.  See the License for the
-	specific language governing permissions and limitations
-	under the License.
-
-* @@@ END COPYRIGHT @@@
-	 */
 	public ServerResource() throws IOException {
 		super();
 	}
@@ -246,19 +224,20 @@ public class ServerResource extends ResourceBase {
 	            String line = scanner.nextLine();
 	            if(line.contains("pstack-ing")) {
 	                continue;
-				} else if (line.contains("pstack") || line.startsWith("--")) {
-					if (pstack == true && sb.length() > 0) {
+	       	    } else if (line.contains("pstack") || line.startsWith("--")) {
+                    if (pstack == true && sb.length() > 0) {
 	                    json.put(new JSONObject().put("PROGRAM", sb.toString()));
 	                    sb.setLength(0);
-						if (line.contains("pstack"))
-							sb.append(line + "\n");
-						pstack = false;
+                        if (line.contains("pstack"))
+                            sb.append(line + "\n");
+                        pstack = false;
 	                } else {
 	                    pstack = true;
-	                    sb.append(line + "\n");
+                        if (line.contains("pstack"))
+                            sb.append(line + "\n");
 	                }
 	            } else {
-	                sb.append(line + "\n");
+	                 sb.append(line + "\n");
 	            }
 	        }
             scanner.close();

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/53b8f22d/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/VersionResource.java b/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
index 63501f5..e05132b 100644
--- a/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
@@ -41,26 +41,11 @@ import org.apache.commons.logging.LogFactory;
 import org.trafodion.rest.model.VersionModel;
 
 /**
-* @@@ START COPYRIGHT @@@
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-
-* @@@ END COPYRIGHT @@@
+ * Implements REST software version reporting
+ * <p>
+ * <tt>/version/rest</tt>
+ * <p>
+ * <tt>/version</tt> (alias for <tt>/version/rest</tt>)
  */
 public class VersionResource extends ResourceBase {
 


Mime
View raw message