[teiid-commits] teiid SVN: r2627 - in branches/7.1.x: common-core/src/main/java/org/teiid/core/util and 1 other directory.
Author: shawkins
Date: 2010-10-05 12:19:47 -0400 (Tue, 05 Oct 2010)
New Revision: 2627
Modified:
branches/7.1.x/client/src/main/java/org/teiid/net/socket/Handshake.java
branches/7.1.x/common-core/src/main/java/org/teiid/core/util/ApplicationInfo.java
Log:
TEIID-1287 fix for client's use of version info that is safe for product builds as
well
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/Handshake.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/Handshake.java 2010-10-05
16:09:40 UTC (rev 2626)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/Handshake.java 2010-10-05
16:19:47 UTC (rev 2627)
@@ -37,7 +37,7 @@
private static final long serialVersionUID = 7839271224736355515L;
- private String version = ApplicationInfo.getInstance().getMajorReleaseNumber();
+ private String version = ApplicationInfo.getInstance().getReleaseNumber();
private byte[] publicKey;
/**
@@ -51,7 +51,7 @@
* @param version The version to set.
*/
public void setVersion() {
- this.version = ApplicationInfo.getInstance().getMajorReleaseNumber();
+ this.version = ApplicationInfo.getInstance().getReleaseNumber();
}
/**
Modified:
branches/7.1.x/common-core/src/main/java/org/teiid/core/util/ApplicationInfo.java
===================================================================
---
branches/7.1.x/common-core/src/main/java/org/teiid/core/util/ApplicationInfo.java 2010-10-05
16:09:40 UTC (rev 2626)
+++
branches/7.1.x/common-core/src/main/java/org/teiid/core/util/ApplicationInfo.java 2010-10-05
16:19:47 UTC (rev 2627)
@@ -70,10 +70,6 @@
return props.getProperty("build.releaseNumber"); //$NON-NLS-1$
}
- public String getMajorReleaseNumber() {
- return getReleaseNumber().substring(0, getReleaseNumber().lastIndexOf('.'));
- }
-
public int getMajorReleaseVersion() {
String version = getReleaseNumber().substring(0,
getReleaseNumber().indexOf('.'));
return Integer.parseInt(version);