Author: phunt
Date: Wed Oct 1 12:05:48 2008
New Revision: 700871
URL: http://svn.apache.org/viewvc?rev=700871&view=rev
Log:
ZOOKEEPER-150. zookeeper build broken
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/Util.java
Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=700871&r1=700870&r2=700871&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Wed Oct 1 12:05:48 2008
@@ -10,10 +10,18 @@
ZOOKEEPER-18. keeper state inconsistency (Jakob Homan via phunt)
+ ZOOKEEPER-38. headers (version+) in log/snap files (Andrew Kornev and Mahadev
+ Konar via breed)
+
+ ZOOKEEPER-127. Use of non-standard election ports in config breaks services
+ (Mark Harwood and Flavio Junqueira via breed)
+
Backward compatibile changes:
BUGFIXES:
+ ZOOKEEPER-150. zookeeper build broken (mahadev via phunt)
+
ZOOKEEPER-144. add tostring support for watcher event, and enums for event
type/state (Jakob Homan via phunt)
@@ -96,9 +104,3 @@
ZOOKEEPER-117. threading issues in Leader election (Flavio Junqueira and
Patrick
Hunt via breed)
-
- ZOOKEEPER-38. headers (version+) in log/snap files (Andrew Kornev and Mahadev
- Konar via breed)
-
- ZOOKEEPER-127. Use of non-standard election ports in config breaks services
(Mark
- Harwood and Flavio Junqueira via breed)
Modified:
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/Util.java
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/Util.java?rev=700871&r1=700870&r2=700871&view=diff
==============================================================================
---
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/Util.java
(original)
+++
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/Util.java
Wed Oct 1 12:05:48 2008
@@ -126,37 +126,7 @@
public static String getFormatConversionPolicy(Properties props){
return props.getProperty(DB_FORMAT_CONV);
}
-
- /**
- * The routine parses the scheme-specific part and returns the attributes
- * values (if any) as an instance of Properties.
- * @param uri the persistence provider URI
- * @return URI attributes
- */
- public static Properties parseUrl(URI uri){
- Properties props=new Properties();
- for(String s: uri.getSchemeSpecificPart().split(";")){
- String[] pair=s.split("=");
- if(pair.length==2){
- if(pair[0].equals(SNAP_DIR)){
- props.setProperty(SNAP_DIR,pair[1]);
- }else if(pair[0].equals(LOG_DIR)){
- props.setProperty(LOG_DIR,pair[1]);
- }else if(pair[0].equals(DB_FORMAT_CONV)){
- props.setProperty(DB_FORMAT_CONV,pair[1]);
- }else{
- LOG.warn("Unknown parameter ["+pair[0]+"] ignored");
- }
- }
- }
- Set<String> pp=props.stringPropertyNames();
- if(!pp.contains(SNAP_DIR) || !pp.contains(LOG_DIR)){
- throw new IllegalArgumentException(
- "Both snapDir and logDir must be specified");
- }
- return props;
- }
-
+
/**
* Extracts zxid from the file name. The file name should have been created
* using one of the [EMAIL PROTECTED] makeLogName} or [EMAIL PROTECTED]
makeSnapshotName}.
