etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use different method for getting component locator in EncodedStringTypeAdapter

This commit is contained in:
alena 2011-06-16 17:23:21 -07:00
parent 2a6307f272
commit f0e7d5e7ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/com/cloud/api/ApiDBUtils.java
View File

@ -18,7 +18,6 @@
package com.cloud.api;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

5
server/src/com/cloud/api/EncodedStringTypeAdapter.java
View File

@ -24,6 +24,7 @@ import org.apache.log4j.Logger;
import com.cloud.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.server.ManagementServer;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.encoding.URLEncoder;
import com.google.gson.JsonElement;
@ -31,12 +32,12 @@ import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
public class EncodedStringTypeAdapter implements JsonSerializer<String> {
public class EncodedStringTypeAdapter implements JsonSerializer<String>{
public static final Logger s_logger = Logger.getLogger(EncodedStringTypeAdapter.class.getName());
private static final boolean encodeApiResponse = configure();
private static boolean configure() {
ComponentLocator locator = ComponentLocator.getCurrentLocator();
ComponentLocator locator = ComponentLocator.getLocator(ManagementServer.Name);
ConfigurationDao configDao = locator.getDao(ConfigurationDao.class);
if (configDao != null) {