Skip to content

Commit 49e1b2f

Browse files
authored
Merge pull request #4818 from raphj/patch-4
Fix typos
2 parents 54f1b11 + 25f491f commit 49e1b2f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-jersey/src/main/java/org/xwiki/rest/jersey/internal/XWikiInjectionManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public <T> T getInstance(Class<T> contractOrImpl)
101101
try {
102102
T component = this.componentManager.getInstance(XWikiRestComponent.class, contractOrImpl.getName());
103103

104-
// In a more standard setup of Jersey, the JAX-RS injection is done at the same time than the JSR-330
104+
// In a more standard setup of Jersey, the JAX-RS injection is done at the same time as the JSR-330
105105
// injection.
106106
// Problem is that for XWiki components we want to use XWiki component manager and not JSR-330 component
107107
// manager so we have to take care of the few field injection in the JAX-RS specification.

xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-jersey/src/main/java/org/xwiki/rest/jersey/internal/XWikiRESTServlet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void service(ServletRequest req, ServletResponse res) throws ServletExcep
6161
if (this.container == null) {
6262
// Do the initialization at the beginning of the first request because we need the previous filters to be
6363
// executed (which is not the case in #init)
64-
initializeCountainer(req.getServletContext());
64+
initializeContainer(req.getServletContext());
6565
}
6666

6767
// Only HTTP requests are supported
@@ -100,7 +100,7 @@ private String encodePlus(String path)
100100
return path.replace("+", "%20");
101101
}
102102

103-
private synchronized void initializeCountainer(ServletContext servletContext) throws ServletException
103+
private synchronized void initializeContainer(ServletContext servletContext) throws ServletException
104104
{
105105
if (this.container != null) {
106106
return;

0 commit comments

Comments
 (0)