Author: kkolinko
Date: Thu Jan 21 15:44:42 2016
New Revision: 1725990
URL: http://svn.apache.org/viewvc?rev=1725990&view=rev
Log:
Set svn:eol-style=native
This was fixed upstream at r1725959.
Noted when running validate-eoln target of build.xml on Gump.
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed)
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObject.java (contents,
props changed)
Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 21 15:44:42 2016
@@ -1 +1 @@
-/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1725738
+/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1725738,1725959
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObject.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObject.java?rev=1725990&r1=1725989&r2=1725990&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObject.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObject.java Thu Jan 21
15:44:42 2016
@@ -1,40 +1,40 @@
-/*
- * 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.
- */
-package org.apache.tomcat.dbcp.pool2;
-
-/**
- * A base class for common functionality.
- *
- * @since 2.4.3
- */
-public abstract class BaseObject {
-
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append(getClass().getSimpleName());
- builder.append(" [");
- toStringAppendFields(builder);
- builder.append("]");
- return builder.toString();
- }
-
- protected void toStringAppendFields(@SuppressWarnings("unused")
StringBuilder builder) {
- // do nothing by default, needed for b/w compatibility.
- }
-
-}
+/*
+ * 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.
+ */
+package org.apache.tomcat.dbcp.pool2;
+
+/**
+ * A base class for common functionality.
+ *
+ * @since 2.4.3
+ */
+public abstract class BaseObject {
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append(getClass().getSimpleName());
+ builder.append(" [");
+ toStringAppendFields(builder);
+ builder.append("]");
+ return builder.toString();
+ }
+
+ protected void toStringAppendFields(@SuppressWarnings("unused")
StringBuilder builder) {
+ // do nothing by default, needed for b/w compatibility.
+ }
+
+}
Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObject.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
