Author: ddumont
Date: Fri Jul 13 19:18:03 2012
New Revision: 1361340
URL: http://svn.apache.org/viewvc?rev=1361340&view=rev
Log:
guard against possible undefined holder in refresh token call
Modified:
shindig/trunk/features/src/main/javascript/features/container/container.js
Modified:
shindig/trunk/features/src/main/javascript/features/container/container.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/container.js?rev=1361340&r1=1361339&r2=1361340&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/container.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/container/container.js
Fri Jul 13 19:18:03 2012
@@ -821,18 +821,20 @@ osapi.container.Container.prototype.refr
var site = self.sites_[siteId];
if (site instanceof osapi.container.GadgetSite) {
var holder = site.getActiveSiteHolder();
- var gadgetInfo =
self.service_.getCachedGadgetMetadata(holder.getUrl());
- if (gadgetInfo[osapi.container.MetadataResponse.NEEDS_TOKEN_REFRESH]) {
- var mid = site.getModuleId(),
- url = osapi.container.util.buildTokenRequestUrl(holder.getUrl(),
mid),
- tokenInfo = response[url];
-
- if (tokenInfo.error) {
- gadgets.warn(['Failed to get token for gadget ',
- url, '.'].join(''));
- } else {
- gadgets.rpc.call(holder.getIframeId(), 'update_security_token',
null,
- tokenInfo[osapi.container.TokenResponse.TOKEN]);
+ if (holder) {
+ var gadgetInfo =
self.service_.getCachedGadgetMetadata(holder.getUrl());
+ if
(gadgetInfo[osapi.container.MetadataResponse.NEEDS_TOKEN_REFRESH]) {
+ var mid = site.getModuleId(),
+ url =
osapi.container.util.buildTokenRequestUrl(holder.getUrl(), mid),
+ tokenInfo = response[url];
+
+ if (tokenInfo.error) {
+ gadgets.warn(['Failed to get token for gadget ',
+ url, '.'].join(''));
+ } else {
+ gadgets.rpc.call(holder.getIframeId(), 'update_security_token',
null,
+ tokenInfo[osapi.container.TokenResponse.TOKEN]);
+ }
}
}
}