Merge branch 'develop' of https://github.com/geonetwork/core-geonetwork…

… into develop
geonetwork · Dec 17, 2013 · 3d11191 · 3d11191
2 parents f3fadc9 + f7b9cfb
commit 3d11191
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractParams.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractParams.java
@@ -87,9 +87,9 @@ public void create(Element node) throws BadInputEx {
 		name       = Util.getParam(site, "name", "");
 		uuid       = Util.getParam(site, "uuid", UUID.randomUUID().toString());
 
-        Element ownerIdE = site.getChild("ownerId");
+        Element ownerIdE = node.getChild("owner");
         if(ownerIdE != null) {
-            ownerId = ownerIdE.getText();
+            ownerId = ownerIdE.getChildText("id");
         }
         ownerIdE = node.getChild("owner");
         if(ownerIdE != null) {
@@ -149,11 +149,10 @@ public void update(Element node) throws BadInputEx {
 
 		name       = Util.getParam(site, "name", name);
 
-        Element ownerIdE = node.getChild("ownerId");
+		Element ownerIdE = node.getChild("owner");
         if(ownerIdE != null) {
-            ownerId = ownerIdE.getText();
-        }
-        else {
+            ownerId = ownerIdE.getChildText("id");
+        } else {
             Log.warning(Geonet.HARVEST_MAN, "No owner defined for harvester: " + name + " (" + uuid + ")");
         }