summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2015-04-22 19:04:32 -0400
committerEndi S. Dewata <edewata@redhat.com>2015-04-22 19:58:03 -0400
commitd462736b525292b2c3c5e27c6cb0f9c273b64451 (patch)
tree3417dc7c2fe4d25bb888b67f1d3c3901b58bc698
parent63c94b96932929dbf34df415145cda069639e69c (diff)
downloadpki-d462736b525292b2c3c5e27c6cb0f9c273b64451.tar.gz
pki-d462736b525292b2c3c5e27c6cb0f9c273b64451.tar.xz
pki-d462736b525292b2c3c5e27c6cb0f9c273b64451.zip
Fixed build issues.
The code has been modified to fix tomcatjss and python-sphinx issues.
-rw-r--r--base/common/python/pki/__init__.py2
-rw-r--r--base/server/tomcat/src/com/netscape/cms/tomcat/NuxwdogPasswordStore.java1
2 files changed, 1 insertions, 2 deletions
diff --git a/base/common/python/pki/__init__.py b/base/common/python/pki/__init__.py
index d80e6c6c7..c383cdb4d 100644
--- a/base/common/python/pki/__init__.py
+++ b/base/common/python/pki/__init__.py
@@ -372,7 +372,7 @@ class PropertyFile(object):
:param index: point at which to insert value.
:type index: int
:param line: value to be inserted.
- :type line; str
+ :type line: str
:return: None
"""
self.lines.insert(index, line)
diff --git a/base/server/tomcat/src/com/netscape/cms/tomcat/NuxwdogPasswordStore.java b/base/server/tomcat/src/com/netscape/cms/tomcat/NuxwdogPasswordStore.java
index c0d87dffa..33cfc8a85 100644
--- a/base/server/tomcat/src/com/netscape/cms/tomcat/NuxwdogPasswordStore.java
+++ b/base/server/tomcat/src/com/netscape/cms/tomcat/NuxwdogPasswordStore.java
@@ -70,7 +70,6 @@ public class NuxwdogPasswordStore implements org.apache.tomcat.util.net.jss.IPas
}
}
- @Override
public String getPassword(String tag, int iteration) {
if (pwCache.containsKey(tag)) {
return pwCache.get(tag);