moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-01-10 05:08:08 -05:00
Code Issues Releases Wiki Activity

Fixes from audit

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2253 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2014-03-10 22:22:33 +00:00
parent 2d31c523cd
commit affdaf3c76
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java/davmail/exchange/VProperty.java
View File

@ -31,6 +31,7 @@ public class VProperty {
} }
protected static final HashSet<String> MULTIVALUED_PROPERTIES = new HashSet<String>(); protected static final HashSet<String> MULTIVALUED_PROPERTIES = new HashSet<String>();
static { static {
MULTIVALUED_PROPERTIES.add("RESOURCES"); MULTIVALUED_PROPERTIES.add("RESOURCES");
MULTIVALUED_PROPERTIES.add("LOCATION"); MULTIVALUED_PROPERTIES.add("LOCATION");
@ -250,7 +251,7 @@ public class VProperty {
public void setParam(String paramName, String paramValue) { public void setParam(String paramName, String paramValue) {
Param currentParam = getParam(paramName); Param currentParam = getParam(paramName);
if (currentParam != null) { if (currentParam != null) {
getParams().remove(currentParam); params.remove(currentParam);
} }
addParam(paramName, paramValue); addParam(paramName, paramValue);
} }
@ -291,6 +292,11 @@ public class VProperty {
return null; return null;
} }
/**
* Return param value.
* @param paramName param name
* @return value
*/
public String getParamValue(String paramName) { public String getParamValue(String paramName) {
Param param = getParam(paramName); Param param = getParam(paramName);
if (param != null) { if (param != null) {
@ -386,12 +392,9 @@ public class VProperty {
if (params != null) { if (params != null) {
for (Param param : params) { for (Param param : params) {
buffer.append(';').append(param.name); buffer.append(';').append(param.name);
if (param.values != null) {
buffer.append('=');
appendParamValues(buffer, param); appendParamValues(buffer, param);
} }
} }
}
buffer.append(':'); buffer.append(':');
if (values != null) { if (values != null) {
boolean firstValue = true; boolean firstValue = true;
@ -410,6 +413,8 @@ public class VProperty {
} }
protected void appendParamValues(StringBuilder buffer, Param param) { protected void appendParamValues(StringBuilder buffer, Param param) {
if (param.values != null) {
buffer.append('=');
boolean first = true; boolean first = true;
for (String value : param.values) { for (String value : param.values) {
if (first) { if (first) {
@ -429,6 +434,7 @@ public class VProperty {
} }
} }
} }
}
/** /**
* Append and encode \n to \\n in value. * Append and encode \n to \\n in value.