juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject [5/5] juddi git commit: Merge branch 'master' into bug/JUDDI-977
Date Sun, 08 Oct 2017 19:55:34 GMT
Merge branch 'master' into bug/JUDDI-977


Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/3e354954
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/3e354954
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/3e354954

Branch: refs/heads/master
Commit: 3e354954d9fea806c685ca91dffc9a4cea42c8e3
Parents: f1f6bf0 1b9d1b9
Author: Alex O'Ree <alexoree@apache.org>
Authored: Sun Oct 8 14:38:09 2017 -0400
Committer: Alex O'Ree <alexoree@apache.org>
Committed: Sun Oct 8 14:38:09 2017 -0400

----------------------------------------------------------------------
 .../org/apache/juddi/api/impl/JUDDIApiImpl.java |  3 ---
 .../juddi/api/impl/API_160_ReplicationTest.java |  1 +
 pom.xml                                         |  1 +
 ...090_SubscriptionListenerIntegrationBase.java | 24 +-------------------
 4 files changed, 3 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juddi/blob/3e354954/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
----------------------------------------------------------------------
diff --cc juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
index 987b8eb,b451556..817c284
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
@@@ -1365,10 -1365,8 +1365,8 @@@ public class JUDDIApiImpl extends Authe
                          if (!((Publisher) publisher).isAdmin()) {
                                  throw new UserMismatchException(new ErrorMessage("errors.AdminReqd"));
                          }
 -                        new ValidateReplication(publisher).validateSetReplicationNodes(replicationConfiguration,
em, node, AppConfig.getConfiguration());
 +                        new ValidateReplication(publisher).validateSetReplicationNodes(replicationConfiguration,
em, getNode(), AppConfig.getConfiguration());
  
-                         //StringWriter sw = new StringWriter();
-                         //JAXB.marshal(replicationConfiguration, sw);
                          org.apache.juddi.model.ReplicationConfiguration model = null;
                          logger.info(publisher.getAuthorizedName() + " is setting the replication
config from " + getRequestorsIPAddress());// + " " + sw.toString());
                          try {

http://git-wip-us.apache.org/repos/asf/juddi/blob/3e354954/pom.xml
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


Mime
View raw message