You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/03/20 11:13:26 UTC
git commit: [OLINGO-175] Fix for (V3) create with inline without
link/href
Repository: incubator-olingo-odata4
Updated Branches:
refs/heads/olingo200 87b5e7db6 -> 5243d5f54
[OLINGO-175] Fix for (V3) create with inline without link/href
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/5243d5f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/5243d5f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/5243d5f5
Branch: refs/heads/olingo200
Commit: 5243d5f54324c4109155e197001793dd48e6d2c3
Parents: 87b5e7d
Author: fmartelli <fa...@gmail.com>
Authored: Thu Mar 20 11:12:59 2014 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Thu Mar 20 11:12:59 2014 +0100
----------------------------------------------------------------------
fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java | 4 ----
.../main/java/org/apache/olingo/fit/utils/XMLUtilities.java | 6 ++++--
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5243d5f5/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
index d368da9..070f2b3 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
@@ -70,7 +70,6 @@ public class FSManager {
}
public FileObject putInMemory(final InputStream is, final String path) throws IOException {
- System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA scrivo "+path);
final FileObject memObject = fsManager.resolveFile(MEM_PREFIX + path);
if (memObject.exists()) {
@@ -85,9 +84,6 @@ public class FSManager {
IOUtils.copy(is, os);
IOUtils.closeQuietly(is);
IOUtils.closeQuietly(os);
-
- System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA inserito valore "+
- IOUtils.toString(memObject.getContent().getInputStream()));
return memObject;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5243d5f5/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
index 564f1f4..0009eea 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
@@ -319,7 +319,9 @@ public class XMLUtilities extends AbstractUtilities {
startDepth = linkInfo.getKey();
final String title = link.getStart().getAttributeByName(new QName("title")).getValue();
- final String href = link.getStart().getAttributeByName(new QName("href")).getValue();
+
+ final Attribute hrefAttr = link.getStart().getAttributeByName(new QName("href"));
+ final String href = hrefAttr == null ? null : hrefAttr.getValue();
try {
final XmlElement inlineElement =
@@ -341,7 +343,7 @@ public class XMLUtilities extends AbstractUtilities {
inlineReader.close();
} catch (Exception ignore) {
// inline element not found (inlines are not mondatory).
- if (entityUriPattern.matcher(href).matches()) {
+ if (StringUtils.isNotBlank(href) && entityUriPattern.matcher(href).matches()) {
links.addLinks(title, href.substring(href.lastIndexOf('/') + 1));
}
}