[
https://issues.apache.org/jira/browse/ZOOKEEPER-2573?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15837510#comment-15837510
]
ASF GitHub Bot commented on ZOOKEEPER-2573:
-------------------------------------------
Github user rakeshadr commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/155#discussion_r97743121
--- Diff: src/java/main/org/apache/zookeeper/version/util/VerGen.java ---
@@ -149,11 +150,9 @@ public static void main(String[] args) {
"Invalid version number format, must be
\"x.y.z(-.*)?\"");
System.exit(1);
}
- int rev;
- try {
- rev = Integer.parseInt(args[1]);
- } catch (NumberFormatException e) {
- rev = -1;
+ String rev = args[1];
+ if (rev == null || rev.trim().isEmpty()) {
+ rev = "-1";
}
--- End diff --
Else block is missing. Could you add rev.trim() function.
> Modify Info.REVISION to adapt git repo
> --------------------------------------
>
> Key: ZOOKEEPER-2573
> URL: https://issues.apache.org/jira/browse/ZOOKEEPER-2573
> Project: ZooKeeper
> Issue Type: Bug
> Components: build, server
> Affects Versions: 3.4.9, 3.5.2
> Reporter: Mohammad Arshad
> Assignee: Edward Ribeiro
> Fix For: 3.4.10, 3.5.3, 3.6.0
>
>
> Modify {{org.apache.zookeeper.version.Info.REVISION}} to store git repo
> revision
> Currently {{org.apache.zookeeper.version.Info.REVISION}} stores the svn repo
> revision which is of type int
> But after migrating to git repo the git repo's revision(commit
> 63f5132716c08b3d8f18993bf98eb46eb42f80fb) can not be stored in this variable.
> So either we should modify this variable to string to introduce new variable
> to store the git revision and leave the svn revision variable unchanged.
> build.xml, and org.apache.zookeeper.version.util.VerGen also need to be
> modified.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
