Author: alexoree
Date: Sun Feb 16 13:22:34 2014
New Revision: 1568759
URL: http://svn.apache.org/r1568759
Log:
JUDDI-852 potentially fixed, Kurt needs to review this commit
JUDDI-851 fixed
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java?rev=1568759&r1=1568758&r2=1568759&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
Sun Feb 16 13:22:34 2014
@@ -157,7 +157,9 @@ public class InquiryHelper {
subscriptionStartIndex.value = null;
result.setTruncated(Boolean.FALSE);
}
-
+ result.getListDescription().setListHead(currentIndex);
+
result.getListDescription().setActualCount(result.getBindingTemplate().size());
+ result.getListDescription().setIncludeCount(returnedRowCount);
return result;
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=1568759&r1=1568758&r2=1568759&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
Sun Feb 16 13:22:34 2014
@@ -1078,8 +1078,12 @@ public class ValidatePublish extends Val
} else {
// If not a key generator, then simply
validate key and then check to see that the proposed key is valid for this
publisher
ValidateUDDIKey.validateUDDIv3Key(entityKey);
- if (!publisher.isValidPublisherKey(em,
entityKey)) {
- throw new
KeyUnavailableException(new ErrorMessage("errors.keyunavailable.BadPartition",
entityKey));
+ //fix for JUDDI-851
+ if
(!entityKey.toUpperCase().startsWith("UUID:"))
+ {
+ if
(!publisher.isValidPublisherKey(em, entityKey)) {
+ throw new
KeyUnavailableException(new ErrorMessage("errors.keyunavailable.BadPartition",
entityKey));
+ }
}
}
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java?rev=1568759&r1=1568758&r2=1568759&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
Sun Feb 16 13:22:34 2014
@@ -35,7 +35,9 @@ public class ValidateUDDIKey {
public static void validateUDDIv3Key(String key) throws
DispositionReportFaultMessage {
if (key == null)
throw new InvalidKeyPassedException(new
ErrorMessage("errors.invalidkey.NullKey"));
-
+ if (key.toLowerCase().startsWith("uuid:")) {
+ return;
+ }
if (! key.contains(KeyGenerator.PARTITION_SEPARATOR)) return;
//v2 style key; no other validation rules apply
String keyToTest = key.trim();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
